http://mds.edugain.org into swamid-interfederations-2.0

author: Leif Johansson <leifj@sunet.se> 2014-06-11 09:14:00 +0200
committer: Leif Johansson <leifj@sunet.se> 2014-06-11 09:14:00 +0200
commit: 60403c628280d09266fb55e298548d3cd6770954 (patch)
tree: d0cfdd91607d67ec5ad845ee2b25b3acc5f94106 /swamid-interfederations-2.0
parent: 4ec37b7f0210ea8e785b70bdb9cf29d4c7bc93e2 (diff)
118 files changed, 5380 insertions, 2562 deletions
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
index 1583a3d7..ae1295b7 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -46,44 +46,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFkjCCBHqgAwIBAgIUezeRt262ZuEutfYIVFc7SYstvyEwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMDUwOTA2MTIzNloXDTE0MDUwOTA2MTIzNlow
-geUxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsrBgEEAYI3PAIBAhMHWnVlcmlj
-aDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzItMDkt
-MjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVyaWNoMRAwDgYDVQQHEwdadWVy
-aWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVlcmljaDEaMBgGA1UECxMRSW5m
-b3JtYXRpa2RpZW5zdGUxFzAVBgNVBAMTDmFhaS1pZHAudXpoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA368dGz9C+Tv3KiG1wG+u+0dwgjVzZv/K
-zpkzCvA3enR7wpeltW65qnXaijcyYAPIIVB4cHpbwUUuWpILUZwrS/uJta+Ywyfh
-9hf7Anw6ZdWllt6+kMV1DbuylZWsUdjYN4mJitGf76AYXa6WJLEmu3hcuyZwoaix
-ItDgH6oRpjWqtegfzD4xyPhRpD9v2R8UHyFzVyv1L9VEenz/ujUI62AQlB6lbdgO
-tx6SohfxafSAB190xYzPDmO/7WGqyW9Shr7K44SEprhvYelJJOFM5IWrTW5d+x5E
-R1sD7IaRoxuj/bG+TH1ZKC5f0777ugLx271id8C0+01YMiZte//kaQIDAQABo4IB
-sTCCAa0wdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5x
-dW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92
-YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+
-WAACZAECMDYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwu
-Y29tL3JlcG9zaXRvcnkwOQYDVR0RBDIwMIIOYWFpLWlkcC51emguY2iCDmlkaWRw
-MDEudXpoLmNogg5pZGlkcDAyLnV6aC5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyE
-CBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUXErAWk61Tl3wU6Gos0NcPiHk
-8CgwDQYJKoZIhvcNAQEFBQADggEBAGaVxEZN4nYmAtXT2B5u1PNftWXir7fXUNOj
-Chfdeu2odPHfCrJPeyUUURzn5ZnuGLkdRAzrJJuCF5Ezoz6Ukg3Za9u0NG4qaaqK
-8mW0J4JxanPMeiDBHEjZVZuzkbgnJASVDyzi1vSZmk+zXW369XdRukmSU84ZVcPu
-xNNo8pyL2NVxyUeysrhd76do+wAjzZnjjz0SuCA66ehmCMwDAWe4HA1tz+JDHepV
-4+klZ2j3lfwG8I4ugsHj1cl28+kysc/uDhQq+WCtQG5DBMRLUGYi+xIX+Kyekt/4
-GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
-						</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>
 MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
 BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index bc663303..d94116f4 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.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-logon.switch.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-25T14:39:29Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-05-09T13:18:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz.xml b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
index ba2b4551..8986080a 100644
--- a/swamid-interfederations-2.0/aleph.svkhk.cz.xml
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md: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>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu.xml b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
index 6f2d52ba..25176f17 100644
--- a/swamid-interfederations-2.0/applications.eu-decide.eu.xml
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
@@ -42,40 +42,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
index fe86e058..dfcbfd8c 100644
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
@@ -41,40 +41,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br.xml b/swamid-interfederations-2.0/apu.uepb.edu.br.xml
index 234a6f32..f7a5f88c 100644
--- a/swamid-interfederations-2.0/apu.uepb.edu.br.xml
+++ b/swamid-interfederations-2.0/apu.uepb.edu.br.xml
@@ -23,26 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
-MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
-RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
-DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
-69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
-C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
-Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
-KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
-X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
-TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
-qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
-D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
-q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
-CvJy0328d1Yogr7WxVkO5sQr
+    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
+ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
+hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
+cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
+cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
+sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
+BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
+MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
+hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
+5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
+zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
+4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
+FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
+w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
+v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
+yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
+el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
+ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -65,27 +66,27 @@ CvJy0328d1Yogr7WxVkO5sQr
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
-MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
-RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
-DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
-69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
-C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
-Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
-KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
-X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
-TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
-qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
-D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
-q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
-CvJy0328d1Yogr7WxVkO5sQr
-
+MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
+ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
+hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
+cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
+cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
+sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
+BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
+MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
+hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
+5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
+zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
+4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
+FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
+w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
+v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
+yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
+el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
+ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
new file mode 100644
index 00000000..7122d4c4
--- /dev/null
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
+        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIJAKGvh4Rjh+jgMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ1
+MzhaFw0xNzA1MTMxNDQ1MzhaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
+YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7w
+bFh51f8XC/y1CJiXg32dC1TojB6F7RHxRuxpPuNh/zp9/7kWStnddGaaOtw9e2fU
+Q/BOe+ztIT5njJ34lKJqfY4mFj3SbuKjDEBk24o/M15IWTLR+0qx5l0uc/U/CSqu
+2wqS6H6u0BMfuRVGFM8NWXJ55SeKBLXbKJVyboweP2pO5AyRBXZHsM8ZEue9hKbn
+qTrXCMS//OfzLarQ7baYtHr+nRbcihJWa2xa+5swiOuf5vEG6sKJT7NbtVbI5b1v
+tzPiCH36ACSHaKkDMsPGCeu5ectunqxQWbufLijzvurKf7EHilIhNvfT+63CIfCp
+t5ViglqeiMJ1tDqham8CAwEAAaN/MH0wXAYDVR0RBFUwU4IeYXR0cmlidXRlLXZp
+ZXdlci5hYWkuc3dpdGNoLmNohjFodHRwczovL2F0dHJpYnV0ZS12aWV3ZXIuYWFp
+LnN3aXRjaC5jaC9zaGliYm9sZXRoMB0GA1UdDgQWBBSDmwCkWamUzbmbv6h8wpic
+9PoE7jANBgkqhkiG9w0BAQUFAAOCAQEAms0jw2xzz2dsT+y1sG6Omc9idxl2ffzf
+Km6t4tEACaDFWxGhP1xGZ9omE+UyuiftW8Tj/8+c4bVUTd/UhhiIdkmhld5M7awF
+8xtzM979p+uL5abezo5D/8O4IYFWpHZdQ+VSl/Wr9tc9N6dmB5c0xzUm4/YzCaNz
+anih2XoBQzYD8ZpxYWopH/Uwt6KiUf9TV92rR2EkmZloH3HyfxdmaOIxQU1boi8e
+GCyqkxNBftgYk65n7Yn5UVBeUr7IBTmzXLFmluhpNYmcslYf/ClArFLNGhHpI5F0
+UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
+						</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>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Attributes Viewer</ServiceName>
+      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
+      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
index ef926099..2226fdb1 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
index 9da8aa00..fa6c2748 100644
--- a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
+++ b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
@@ -23,28 +23,22 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
-EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
-cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
-CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
-MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
-c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
-BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
-MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
-MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
-ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
-jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
-9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
-0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
-sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
-7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
-mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
-qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
-nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
-uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
+BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
+NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
+BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
+w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
+9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
+PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
+VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
+ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
+zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
+Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
+/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
+lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
+W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
+Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
+UG8d4Q==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +61,22 @@ uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
-EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
-cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
-CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
-MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
-c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
-BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
-MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
-MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
-ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
-jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
-9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
-0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
-sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
-7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
-mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
-qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
-nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
-uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
+BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
+NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
+BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
+w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
+9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
+PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
+VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
+ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
+zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
+Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
+/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
+lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
+W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
+Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
+UG8d4Q==
 		    
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
index 4417d1c1..89b475f9 100644
--- a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
+++ b/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
@@ -23,21 +23,26 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
-BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
-MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
-f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
-sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
-0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
-sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
-dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
-ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
-dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
-Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
-Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
-lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
-fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==
+    MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
+c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
+9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
+BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
+Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
+LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
+KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
+CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
+YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
+ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
+nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
+b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
+AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
+3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
+qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
+MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
+7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
+R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
+6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
+Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -60,22 +65,27 @@ fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==
         <ds:X509Data>
           <ds:X509Certificate>
       
-                MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
-BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
-MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
-f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
-sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
-0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
-sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
-dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
-ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
-dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
-Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
-Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
-lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
-fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==    
-                
+MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
+c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
+9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
+BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
+Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
+LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
+KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
+CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
+YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
+ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
+nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
+b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
+AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
+3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
+qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
+MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
+7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
+R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
+6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
+Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=		
+		
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
index 1bf9704a..c3ce14ad 100644
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
@@ -23,26 +23,29 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
-MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
-Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
-8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
-7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
-9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
-728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
-mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
-FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
-ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
-hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
-q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
+    MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
+IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
+SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
+VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
+aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
+MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
+bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
+bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
+BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
+UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
+v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
+3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
+omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
+2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
+mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
+H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
+R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
+HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
+mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
+sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -65,27 +68,29 @@ q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
-MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
-Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
-8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
-7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
-9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
-728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
-mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
-FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
-ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
-hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
-q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
-
+MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
+IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
+SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
+VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
+aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
+MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
+bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
+bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
+BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
+UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
+v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
+3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
+omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
+2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
+mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
+H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
+R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
+HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
+mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
+sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.udesc.br.xml b/swamid-interfederations-2.0/cafe.udesc.br.xml
new file mode 100644
index 00000000..09904ac8
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.udesc.br.xml
@@ -0,0 +1,120 @@
+<?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://cafe.udesc.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">udesc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.udesc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.udesc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
+BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
+aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
+YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
+YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
+MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
+YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
+bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
+ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
+WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
+oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
+nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
+1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
+bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
+g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
+06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
+4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
+VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
+C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
+qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
+WiKadQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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://cafe.udesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.udesc.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.udesc.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.udesc.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">udesc.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
+BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
+aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
+YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
+YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
+MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
+YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
+bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
+ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
+WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
+oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
+nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
+1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
+bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
+g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
+06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
+4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
+VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
+C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
+qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
+WiKadQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.udesc.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.udesc.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Setor de Infraestrutura - SETIC</SurName>
+    <EmailAddress>seinfra.setic@udesc.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br.xml
new file mode 100644
index 00000000..8c37c66c
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufra.edu.br.xml
@@ -0,0 +1,112 @@
+<?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://cafe.ufra.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">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufra.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufra.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
+bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
+EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
+BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
+EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
+WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
+bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
+OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
+sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
+zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
+hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
+sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
+8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
+MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
+zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
+3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
+QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.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://cafe.ufra.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufra.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufra.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>
+      
+MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
+bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
+EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
+BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
+EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
+WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
+bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
+OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
+sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
+zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
+hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
+sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
+8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
+MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
+zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
+3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
+QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.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">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufra.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufra.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Joaquim de Jesus Soares</SurName>
+    <EmailAddress>admin@ufra.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br.xml b/swamid-interfederations-2.0/cafe.unicentro.br.xml
index 0e3bcb80..8960bf5d 100644
--- a/swamid-interfederations-2.0/cafe.unicentro.br.xml
+++ b/swamid-interfederations-2.0/cafe.unicentro.br.xml
@@ -23,30 +23,29 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
-YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
-aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
-MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
-AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
-Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
-aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
-CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
-YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
-R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
-AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
-RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
-UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
-Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
-DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
-MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
-7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
-vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
-9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
-H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
-rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
-uIoHx7ZhxQYffJyfRtc=
+    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
+BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
+bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
+Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
+BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
+MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
+ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
+ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
+EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
+BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
+na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
+1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
+tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
+dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
+RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
+RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
+DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
+2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
+eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
+x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
+lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -69,30 +68,29 @@ uIoHx7ZhxQYffJyfRtc=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
-YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
-aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
-MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
-AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
-Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
-aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
-CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
-YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
-R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
-AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
-RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
-UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
-Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
-DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
-MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
-7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
-vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
-9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
-H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
-rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
-uIoHx7ZhxQYffJyfRtc=
+MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
+BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
+bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
+Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
+BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
+MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
+ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
+ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
+EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
+BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
+na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
+1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
+tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
+dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
+RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
+RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
+DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
+2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
+eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
+x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
+lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.unisc.br.xml b/swamid-interfederations-2.0/cafe.unisc.br.xml
index 628584ed..66d7227f 100644
--- a/swamid-interfederations-2.0/cafe.unisc.br.xml
+++ b/swamid-interfederations-2.0/cafe.unisc.br.xml
@@ -23,21 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    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
+    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
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -60,21 +66,27 @@ XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEU2luZjELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTMwMjA2MTc1MzQ1WhcNMTYwMjA2
-MTc1MzQ1WjArMQ0wCwYDVQQLEwRTaW5mMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxA4rJA1Us3xte9
-CXYcYfkxH/kmOsE1j9N9BqccuWV8wSVuMkQ8V8JDSAm+MyvXTsu6cwhoGeWZtu/D
-wFzvSwX8vaXXsSFFKx+WB6QtmOqWX2rEcn6Z6nGNE41vbKYH8xm71ge47NbTLklJ
-Ml6JnR8qXajr4ewKR4mcsZ0mxa3xii7aLz5MeeE0TQT4N9YX8okE8FADNTCh3bnC
-7eEcjYhgbP71VDZRJFuHHiImn+vBE2dfsLF8sRWbM8hhUkUfZEu3z5rDctjH6TXf
-dkWD2DU1kRSpd6ZxbqoJsBrYTGRlLN83CkNs/pMyP3yQ2CQ5/8HhH5Mh7qgRuPA2
-HnWye90CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsuqKAz0R93jVSFBhXOkD5EJJ
-knViFHZlqc1ih8WAG1vj7IJMN8TonsmdyMdYxvfDz6bOQdBBZydwu01J4hDh7NU9
-ElT1CBEIojATIRaGry2y+TWr761yDo0ksla1TlOSuse31u9FCEJy7UmdEoslspVp
-ufJBdeOZESeHVkXitYAWCbDB1iKDgyllOob9w+B/2f3MSrz4wkEPKWuLRpFD+5IX
-XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
-8KlYPGgRz7bqidsVO94mihOF4AtONQ9oOydh3lfdZHKFiRkSSInkr5IH46Alcw==
+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
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br.xml b/swamid-interfederations-2.0/cafe1.ufes.br.xml
index 39fcf0b3..b12be60b 100644
--- a/swamid-interfederations-2.0/cafe1.ufes.br.xml
+++ b/swamid-interfederations-2.0/cafe1.ufes.br.xml
@@ -23,29 +23,26 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
-TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
-9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
-aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
-AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
-MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
-YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
-IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
-ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
-bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
-B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
-8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
-y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
-fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
-yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
-Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
-cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
-65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
-B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
-bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
+    MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
+BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
+LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
+CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
+MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
+A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
+DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
+BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
+dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
+F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
+JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
+QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
+B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
+vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
+1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
+dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
+sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
+KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,29 +65,26 @@ bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
-TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
-9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
-aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
-AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
-MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
-YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
-IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
-ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
-bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
-B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
-8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
-y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
-fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
-yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
-Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
-cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
-65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
-B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
-bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
+MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
+BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
+LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
+CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
+MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
+A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
+DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
+BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
+dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
+F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
+JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
+QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
+B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
+vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
+1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
+dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
+sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
+KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
index 182a3440..23d2cca4 100644
--- a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
+++ b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
@@ -23,27 +23,32 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
-byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
-CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
-emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
-by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
-JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
-BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
-Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
-HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
-aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
-BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
-thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
-M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
-FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
-HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
-WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
-qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
-DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
-sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+    MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
+eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
+Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
+dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
+EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
+b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
+VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
+ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
+audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
+/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
+Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
+CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
+0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
+oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
+i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
+gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
+BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
+BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
+AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
+tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
+X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
+QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
+uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
+pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,27 +71,32 @@ sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
-byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
-CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
-emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
-by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
-JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
-BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
-Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
-HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
-aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
-BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
-thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
-M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
-FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
-HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
-WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
-qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
-DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
-sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
+eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
+Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
+dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
+EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
+b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
+VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
+ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
+audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
+/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
+Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
+CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
+0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
+oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
+i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
+gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
+BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
+BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
+AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
+tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
+X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
+QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
+uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
+pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
index e88d87cc..603aae3e 100644
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
+++ b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
@@ -23,30 +23,22 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
-VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
-BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
-HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
-VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
-MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
-cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
-ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
-cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
-aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-+5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
-aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
-UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
-MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
-o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
-VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
-waiW5wfG
+    MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
+               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
+               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
+               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
+               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
+               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
+               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
+               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
+               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
+               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
+               EnZQnP4F
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -69,33 +61,23 @@ waiW5wfG
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
-VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
-BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
-HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
-VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
-MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
-cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
-ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
-cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
-aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-+5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
-aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
-UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
-MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
-o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
-VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
-waiW5wfG
-            
-	
-		
+               MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
+               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
+               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
+               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
+               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
+               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
+               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
+               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
+               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
+               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
+               EnZQnP4F	
+	           
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
index bee80139..c8a89781 100644
--- a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -16,6 +21,7 @@
         <mdui:Description xml:lang="en">Collection Registry</mdui:Description>
         <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
index 1bd9eebb..538bffd8 100644
--- a/swamid-interfederations-2.0/community.ja.net.xml
+++ b/swamid-interfederations-2.0/community.ja.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
-  <!--
-		This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
index ac7aacde..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org.xml
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
         <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
         <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/de.dariah.eu.xml b/swamid-interfederations-2.0/de.dariah.eu.xml
index 634e626c..1f116991 100644
--- a/swamid-interfederations-2.0/de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/de.dariah.eu.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -16,6 +21,7 @@
         <mdui:Description xml:lang="en">DARIAH DE Portal</mdui:Description>
         <mdui:InformationURL xml:lang="de">http://www.dariah.eu</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.dariah.eu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
index 803bf9de..c8444be0 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
-  <!--
-		This is a Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/dev2.dariah.eu.xml b/swamid-interfederations-2.0/dev2.dariah.eu.xml
index a6bf222d..1a2ed256 100644
--- a/swamid-interfederations-2.0/dev2.dariah.eu.xml
+++ b/swamid-interfederations-2.0/dev2.dariah.eu.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -18,30 +23,47 @@
         <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
         <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>dev2.dariah.eu</ds:KeyName>
+        <ds:KeyName>wiki.de.dariah.eu</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=dev2.dariah.eu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIJALg01o2oofKQMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmRldjIuZGFyaWFoLmV1MB4XDTEzMDIxMjE0NDM1OFoXDTE2MDIxMjE0NDM1
-OFowGTEXMBUGA1UEAxMOZGV2Mi5kYXJpYWguZXUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDQGrDWasLQsqQfYvkQMNCjnrMgFqOkNUSxCi2M3rV4lv1H
-mu8X0p97r7dc9StkKRkKAg0cnUjKrC6fh7P19HVbbjZC0d4pNEBdP61KDLl+5SWE
-Abt5dFxvQyrgv0uoYyETTmuVU7ga/g9hwtCe8n/XxGQ75YbTAiceoFA4UAFZ5E/R
-v2dsipjmaKXXp6nEwsZMzbU16zJv8c2FwB98HYzmtbQX9HW6FbVxP4JLg7A78TJ4
-XaPCP3ashkoSKoEoWZnxqiWboOaIg+mlD/RS1CDjLDPcRoyFUzfAleKVk/Xls5v5
-FuquFS72PaeDLjnPGQArO4cDvmw7+xC3nwCccxuJAgMBAAGjXzBdMDwGA1UdEQQ1
-MDOCDmRldjIuZGFyaWFoLmV1hiFodHRwczovL2RldjIuZGFyaWFoLmV1L3NoaWJi
-b2xldGgwHQYDVR0OBBYEFFTcZ4S7fZ5cX9rFSm7UXdvBT/baMA0GCSqGSIb3DQEB
-BQUAA4IBAQCUF1SFAN8kkLjbVkoaOMsPVzf/Ygez9x/DHSiGamtzJTLm9hsYl9o+
-MDjtYXS4v/+zEh60zSK/o4MMW8kYxLBwVvvh1WgK0U/YvGY7cSGZvelFRw0vdBcZ
-RsRX2FodV49fYxgxFo6EKHDgi5rFOtA5weziXF5/gzxJkKh7xh6Qn+cZqkfIDtg2
-BA3XFSiScfM/TM8w947yxu0lcNvaUwg8sv1N5ULvmDM503WiiBcA0kxvNFH+IXUF
-MOUQT99oHyEzOEAQwHpPHesmOVyjTWpP5SVW1SAUYOSjasUlGsljGgpa3sZ6ZEcD
-hcZyahwPu8E5aiHGJpxqAthlbJ1g/YJh
+          <ds:X509SubjectName>CN=wiki.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF/jCCBOagAwIBAgIHF2tAlMzjKDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTE0MTJaFw0xOTA0MTMx
+MTE0MTJaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGNzmj1hudMzfTvXsltAAWT
+fmN0YgnhUCSbZ67cUp487ZvCicwFdhcg2uLHxtbQO3HbLagQg4Xa8oWA/4odBWfW
++CC3erj6Amqf+ypSVd/Rssd2Bq6Sm6zVNYC34cs0MOZaT06WQDyY9ygJyYhl4g04
+qAiCISpAbVy9TA81qwE0SCMfcj4mczClVg5nJHV93lRZZc7rzsC7xSWg2Akpv9TS
+uAfp5Ee0QfHeZl1Zsw9fWQAtumdFBlqU2uXBHBlwUN2xjwgX2j7vQJtllbOmQIDp
+ZkZjk26TIgbwrI7WPXjKAoTAEy+qAr7YL2b1oQbe+7BcJ4zhaM3yK3HOXRD1KAkC
+AwEAAaOCAkYwggJCMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysG
+AQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQn2EIzO3GM
+hnk0ubTuQl5owPwJpDAfBgNVHSMEGDAWgBQdvXPMbe5uHHRw2aMbOrqoJ9686zAc
+BgNVHREEFTATghF3aWtpLmRlLmRhcmlhaC5ldTCBjwYDVR0fBIGHMIGEMECgPqA8
+hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1n
+b2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB0DCB
+zTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZl
+ci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1n
+b2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBADS62Nr+Hh7LJ50zukIm
+JcNJ4BIMP255g5DnYmpaaJ+IDLPvNPRAxT+zqMlFdDGr3xrb+cp4BDY1OQswZaoj
+AMLxXsjv1VAv3bhBGkl+NEyTa7qIGdayIuSutArAo8WXlLfMwR7yNmpiJ3QY8BEj
+CqGJcXyswPLLU7G7v+ChZSJbe4YJOy4IJ8OD9PgTR3FMteX6f6WGr5nWWBO0tZNP
+Fr2Mggyxt/CGpTSZ4kAkQJni1qqJ+QPEPQF59/fNNg4WQ4WBbd0wzKVmc4ikpcmI
+O+llrInqXrOgVYgVxBhaxDOQcWkF8zLxl/C+XbEtG4Z+YPH43usoid2uq541zAb5
+9B0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net.xml b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
index 8a71d915..ddb75036 100644
--- a/swamid-interfederations-2.0/educonf-directory.geant.net.xml
+++ b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
@@ -1,57 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-10T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-28T13:11:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">eduCONF</mdui:DisplayName>
         <mdui:Description xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.geant.net/service/educonf/pages/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://educonf-directory.geant.net/privacy_policy.php</mdui:PrivacyStatementURL>
         <mdui:Logo height="96" width="350" xml:lang="en">https://educonf-directory.geant.net/pic/eduCONF_logo.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNVBAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjENMAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQwMzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMxCzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxKhy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4AHfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbHP50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJOn20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdjtqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQWBBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jHWJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3BvbHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJORDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJKzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+51Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBHAXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=</ds:X509Certificate>
+          <ds:X509Certificate>
+						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
+						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
+						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
+						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
+						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
+						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
+						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
+						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
+						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
+						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
+						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
+						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
+						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
+						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
+						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
+						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
+						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
+						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
+						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
+						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNVBAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjENMAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQwMzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMxCzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxKhy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4AHfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbHP50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJOn20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdjtqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQWBBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jHWJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3BvbHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJORDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJKzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+51Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBHAXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=</ds:X509Certificate>
+          <ds:X509Certificate>
+						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
+						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
+						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
+						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
+						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
+						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
+						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
+						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
+						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
+						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
+						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
+						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
+						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
+						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
+						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
+						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
+						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
+						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
+						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
+						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">eduCONF</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GÉANT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduCONF</md:GivenName>
-    <md:SurName>VC team</md:SurName>
-    <md:EmailAddress>mailto:educonf@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">eduCONF</ServiceName>
+      <ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</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="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="givenName" Name="urn:oid:2.5.4.42" 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="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="true"/>
+    </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.geant.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>eduCONF</GivenName>
+    <EmailAddress>mailto:support@geant.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>eduCONF VC Team</GivenName>
+    <EmailAddress>mailto:educonf@geant.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
new file mode 100644
index 00000000..a231e4cd
--- /dev/null
+++ b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eka-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eka-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eka-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - EKA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The University College of Economics and Culture- EKA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://eka.edu.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
index 5bffe413..56d2736a 100644
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
+++ b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.jacson.jiscadvance.biz/authentication/sp/metadata">
-  <!--
-		This is a JACSoN OpenConext SP for the JISC Services Management Company Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index da3a3dbe..57c474ac 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -14,12 +24,8 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
@@ -50,47 +56,47 @@ NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
 o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Funet FileSender</md:ServiceName>
-      <md:ServiceName xml:lang="en">Funet FileSender</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Funet FileSender</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Harri</md:GivenName>
-    <md:SurName>Kuusisto</md:SurName>
-    <md:EmailAddress>mailto:funyht@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomi</md:GivenName>
-    <md:SurName>Salmi</md:SurName>
-    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tomi</md:GivenName>
-    <md:SurName>Salmi</md:SurName>
-    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
+      <ServiceName xml:lang="en">Funet FileSender</ServiceName>
+      <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
+      <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
+      <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Harri</GivenName>
+    <SurName>Kuusisto</SurName>
+    <EmailAddress>mailto:funyht@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tomi</GivenName>
+    <SurName>Salmi</SurName>
+    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Tomi</GivenName>
+    <SurName>Salmi</SurName>
+    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index 91edbfcc..ba803cd9 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,15 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
@@ -22,20 +43,26 @@
       <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:Company>UNINETT AS</md:Company>
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Solberg</md:SurName>
-    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
-    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fortbildung.unibas.ch.xml b/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
new file mode 100644
index 00000000..d910aaa1
--- /dev/null
+++ b/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fortbildung.unibas.ch/Shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor 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">University Basel</mdui:DisplayName>
+        <mdui:Description xml:lang="en">further education</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIJANnJ1QgP58F1MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDAeFw0xNDA2MTAxNDEyMjZaFw0xNzA2
+MDkxNDEyMjZaMCAxHjAcBgNVBAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuIQhaIRM/rhOAKHV9Cu1DwU9K5
+p+YhOMDJx+mv8ggp3F2pc/nw/wiPjAc9OhMqDHVMrs6IaQWdy31DvZ9PxLqmZJlD
+bf/7cVEEWai/lqAoymkac13Bcgc1PgF4fTChCV0F9PyEWRgLwVrBetDpvPr/dkNo
+q9dSKA1mrjRIrOMxWRzv/WR7+zrwuj6ZUiZ2WPrRX7RoieYTYBov2iw9f7osSqT6
+tP5313J93O/KyGwU3bS++BtxDG6aWbIqrMt/xVskozFwVhxdFW944590g0aDYwNj
+hDwZhBB1IWdDAjGw2To12uSfvnUAX9zYHxds3meALvh9LhX9ct7u9F+YdWsCAwEA
+AaNtMGswSgYDVR0RBEMwQYIVZm9ydGJpbGR1bmcudW5pYmFzLmNohihodHRwczov
+L2ZvcnRiaWxkdW5nLnVuaWJhcy5jaC9TaGliYm9sZXRoMB0GA1UdDgQWBBQApJtP
+47MI9o8mbn92AZsHMCXYhDANBgkqhkiG9w0BAQUFAAOCAQEAecHA6G5GBABAdw+9
+FQFinTCDdi9ChOTYhdcv89wx7H8C/o5bG2NKyNYx3JiZuOjgo/4LOp1saiKH+2UY
+yG/uwXTy6GbBKJAkB2NQYIhTkoqKBzOavUvP8i7UymeTzvpfzKuTWNLDRyYhISt7
+6CaLblLHxmlD9PZ5K8hKczEG59E5EcJlEe8L1Nw7MkRFtJwHH+g/JeK4reEbBQqK
+03O00gs2IkRJqKn1ZFmN/xHOjpuqlAEwWAH4Qwj5Ji2wpHhsc8OuYqgr0tmcfri7
+sUHK7oavc8VVHlRMjbCexdPiLH1VU6x0h9ME/s3GAjzbh1dothnjIrZoeDqfyzoU
+VV1F+A==
+
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <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://fortbildung.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">University Basel</ServiceName>
+      <ServiceDescription xml:lang="en">further education</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="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">unibas.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Basel</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Basel</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">Université de Bâle</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.unibas.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unibas.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.unibas.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Viviane</GivenName>
+    <SurName>Cantaluppi</SurName>
+    <EmailAddress>mailto:v.cantaluppi@jcssoft.ch</EmailAddress>
+    <TelephoneNumber>+41617069830</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Pascal</GivenName>
+    <SurName>Cantaluppi</SurName>
+    <EmailAddress>mailto:p.cantaluppi@jcssoft.ch</EmailAddress>
+    <TelephoneNumber>+41617069830</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
index 8337d484..d6fcb2ed 100644
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
@@ -41,40 +41,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org.xml b/swamid-interfederations-2.0/gw-astronomy.org.xml
new file mode 100644
index 00000000..2590ede0
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
+xWUYS9G3JfMMW9UY
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Koranda</md:GivenName>
+    <md:EmailAddress>skoranda@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM CGCA Help</md:GivenName>
+    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Spadanuda</md:GivenName>
+    <md:EmailAddress>cspada@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it.xml b/swamid-interfederations-2.0/gw.ct.infn.it.xml
index 62e2b921..268cf664 100644
--- a/swamid-interfederations-2.0/gw.ct.infn.it.xml
+++ b/swamid-interfederations-2.0/gw.ct.infn.it.xml
@@ -32,40 +32,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
index e3f54037..123d41e3 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
-  <!--
-		This is a IAM@Cardiff Shibboleth SP for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
index 59b543d0..6139f822 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth 2 test IdP for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
index 546b3910..348badbd 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP (clustered with Terracotta 3.0) for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml
new file mode 100644
index 00000000..cae8165c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.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="2013-10-29T15:00:00Z">
+      <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">irccs-stellamaris.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/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>MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+                            BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+                            MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+                            bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+                            AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+                            Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+                            Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+                            jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+                            LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+                            TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+                            cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+                            YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+                            VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+                            72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+                            XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+                            eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+                            PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
+                            tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
+                            lKnM7w==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.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-stellamaris.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-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.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-stellamaris.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-stellamaris.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">irccs-stellamaris.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+                            BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+                            MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+                            bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+                            AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+                            Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+                            Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+                            jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+                            LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+                            TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+                            cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+                            YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+                            VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+                            72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+                            XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+                            eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+                            PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
+                            tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
+                            lKnM7w==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.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 Stella Maris</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>technical support</md:GivenName>
+    <md:EmailAddress>mailto:ced@irccs-stellamaris.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
index 98f5ead2..0aaf6de9 100644
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
index 2e3a2ed9..f497452e 100644
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cardiff.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP (running clustered with Terracotta 3.0) for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-23T17:54:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
index 7f61c336..6863a333 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.company.ja.net/idp/shibboleth">
-  <!--
-		This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index c7c70c4c..c26902b0 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+<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" entityID="https://idp.csc.fi/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
         <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
       </mdui:DiscoHints>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
@@ -62,27 +63,27 @@ OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
 yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Lauros</SurName>
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net.xml
index 69539885..505407b5 100644
--- a/swamid-interfederations-2.0/idp.dante.net.xml
+++ b/swamid-interfederations-2.0/idp.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="https://idp.dante.net/idp/shibboleth">
-  <!--
-		This is a DANTE Shibboleth IdP 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-03T09:32:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
index 0a96e7f9..19d446f1 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index b83f99cc..c49edf1d 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,343 +1,352 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">met.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">overhalla.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fosnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ralingen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
         </ds:X509Data>
@@ -347,10 +356,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
     <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
   </md:Organization>
@@ -358,8 +367,4 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fgu.cas.cz.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz.xml
new file mode 100644
index 00000000..5e5c5c37
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fgu.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.fgu.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">fgu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physiology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Fyziologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider  IOP AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FGÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fgu.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fgu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="282">https://jiftach.cas.cz/loga/logo-fgu-44.png</mdui:Logo>
+        <mdui:Logo height="153" width="980">https://jiftach.cas.cz/loga/logo-fgu-153.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
+MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
+ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
+N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
+Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
+mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
+n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
+Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
+AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
+/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
+9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
+giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
+4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.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">fgu.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
+MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
+ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
+N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
+Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
+mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
+n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
+Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
+AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
+/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
+9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
+giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
+4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Physiology</OrganizationName>
+    <OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.fgu.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.hainaut-promsoc.be.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml
new file mode 100644
index 00000000..15300949
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml
@@ -0,0 +1,107 @@
+<?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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">hainaut-promsoc.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
+dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
+3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
+DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
+HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
+xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
+h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
+OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
+cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
+MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
+DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
+Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
+Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
+HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/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">hainaut-promsoc.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
+dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
+3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
+DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
+HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
+xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
+h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
+OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
+cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
+MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
+DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
+Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
+Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
+HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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">Enseignement de Promotion Sociale de la Province de Hainaut</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>webmaster@hainaut-promsoc.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 8e44ef54..ea2e29e0 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,16 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+      <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">ids-mannheim.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+        <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
 RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
 AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
@@ -37,37 +51,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
 HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
 xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
 VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
+99YJ9IIzYQ==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Oliver</md:GivenName>
-    <md:SurName>Schonefeld</md:SurName>
-    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/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>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
+MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
+NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
+8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
+mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
+mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
+WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
+AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
+4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
+BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
+b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
+MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
+QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
+bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
+HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
+xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
+VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
+99YJ9IIzYQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de: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="de">e217</OrganizationName>
+    <OrganizationName xml:lang="en">e217</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Oliver</GivenName>
+    <SurName>Schonefeld</SurName>
+    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Andreas</GivenName>
+    <SurName>Witt</SurName>
+    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>AAI</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.img.cas.cz.xml b/swamid-interfederations-2.0/idp.img.cas.cz.xml
new file mode 100644
index 00000000..4b8688fe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.img.cas.cz.xml
@@ -0,0 +1,112 @@
+<?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.img.cas.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="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>
+  </md: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">img.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for IMG ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Poskytovatel identity pro zaměstnance ÚMG AV ČR.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.img.cas.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.img.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="104">https://idp.img.cas.cz/images/img_logo_small.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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
+DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
+Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
+cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
+7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
+wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
+fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
+y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
+3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
+0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
+eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
+RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
+N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.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">img.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
+DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
+Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
+cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
+7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
+wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
+fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
+y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
+3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
+0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
+eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
+RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
+N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IMG</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.img.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Michal</GivenName>
+    <SurName>Zacek</SurName>
+    <EmailAddress>michal.zacek@img.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz.xml b/swamid-interfederations-2.0/idp.lib.cas.cz.xml
index 7adcd2d1..47a28be6 100644
--- a/swamid-interfederations-2.0/idp.lib.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.lib.cas.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md: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>
diff --git a/swamid-interfederations-2.0/idp.mci4me.at.xml b/swamid-interfederations-2.0/idp.mci4me.at.xml
new file mode 100644
index 00000000..24b4601e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mci4me.at.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mci4me.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-08-26T15:09:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">mci4me.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Management Center Innsbruck</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
+OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
+HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
+RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
+QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
+0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
+0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
+DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
+FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
+llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
+5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
+JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
+FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at: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.mci4me.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mci4me.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mci4me.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mci4me.at/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">mci4me.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
+OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
+HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
+RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
+QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
+0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
+0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
+DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
+FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
+llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
+5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
+JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
+FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at: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="de">Management Center Innsbruck</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Management Center Innsbruck</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Management Center Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Management Center Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.mci4me.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.mci4me.at/index.php?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Florian</md:GivenName>
+    <md:SurName>Lechner</md:SurName>
+    <md:EmailAddress>mailto:florian.lechner@mci.edu</md:EmailAddress>
+    <md:TelephoneNumber>+43 512 2070 1407</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
index 273dc704..3d0cfec1 100644
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
+++ b/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
@@ -2,7 +2,7 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.meduniwien.ac.at/idp/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-03T14:46:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
index 32c71a1b..6853c2a6 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
index 78f674e3..37bb406b 100644
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
@@ -23,24 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
-NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
-aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
-wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
-6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
-CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
-pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
-VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
-GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
-YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
-9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
-CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
-2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
-BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
-zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
-k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
+T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
+A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
+ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
+CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
+MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
+IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
+CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
+cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
+CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
+i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
+5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
+bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
+knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
+KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
+VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
+BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
+RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
+TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
+myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -63,24 +67,28 @@ k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
-NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
-aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
-wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
-6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
-CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
-pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
-VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
-GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
-YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
-9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
-CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
-2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
-BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
-zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
-k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
+T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
+A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
+ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
+CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
+MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
+IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
+CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
+cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
+CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
+i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
+5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
+bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
+knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
+KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
+VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
+BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
+RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
+TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
+myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu.xml b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
new file mode 100644
index 00000000..86e2630e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-03-15T10:30:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </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">kit.edu</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Karlsruher Institut für Technologie - Universität des Landes Baden-Württemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft</mdui:Description>
+        <mdui:Description xml:lang="en">Karlsruhe Institute of Technology - University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.scc.kit.edu/logo/kit-logo-small.png</mdui:Logo>
+        <mdui:Logo height="120" width="260">https://idp.scc.kit.edu/logo/kit-logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.scc.kit.edu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.scc.kit.edu/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
+MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
+ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
+HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
+PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
+mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
+MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
+fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
+MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
+ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
+mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
+bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
+JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
+yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
+kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
+ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
+ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
+zea6MPIosg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</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.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </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">kit.edu</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
+MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
+ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
+HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
+PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
+mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
+MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
+fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
+MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
+ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
+mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
+bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
+JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
+yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
+kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
+ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
+ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
+zea6MPIosg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu: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="de">e148</OrganizationName>
+    <OrganizationName xml:lang="en">e148</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.scc.kit.edu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Michael</GivenName>
+    <SurName>Simon</SurName>
+    <EmailAddress>mailto:simon@kit.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Sebastian</GivenName>
+    <SurName>Labitzke</SurName>
+    <EmailAddress>mailto:labitzke@kit.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>SCC</GivenName>
+    <SurName>Servicedesk</SurName>
+    <EmailAddress>mailto:servicedesk@scc.kit.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
index 676a22e2..bec0386e 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
-  <!--
-		This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
index 847db204..a417a233 100644
--- a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
@@ -23,14 +23,13 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
-MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
-MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
-NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
-IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
-LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+    MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
+BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
+byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
+MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
+CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
 IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
 NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
@@ -38,12 +37,12 @@ NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
 68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
 MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
 HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
-YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
-68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
-gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
-AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
-zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
+hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
+QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
+Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
+YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
+NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,14 +65,13 @@ zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
-MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
-MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
-NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
-IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
-LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
+BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
+byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
+MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
+CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
 IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
 NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
@@ -81,13 +79,12 @@ NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
 68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
 MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
 HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
-YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
-68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
-gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
-AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
-zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
-
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
+hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
+QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
+Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
+YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
+NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.unipi.it.xml b/swamid-interfederations-2.0/idp.unipi.it.xml
new file mode 100644
index 00000000..f581e8f1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unipi.it.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli Studi di Pisa</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idp.unipi.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idp.unipi.it/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unipi.it/privacy_it.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unipi.it/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="82" width="80">https://idp.unipi.it/logos/cherubino_80x80.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.unipi.it/logos/cherubino_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0zMTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVOzGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldewzvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqBT1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40WmcAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm26PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJKoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60mPv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4RgwuxZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/
+                            r9aWLZYsIVPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao= 
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0zMTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVOzGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldewzvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqBT1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40WmcAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm26PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJKoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60mPv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4RgwuxZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/
+                            r9aWLZYsIVPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao= 
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it: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>
+    <md:OrganizationName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">Università degli Studi di Pisa</md:OrganizationName>
+    <md:OrganizationName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">University of Pisa</md:OrganizationName>
+    <md:OrganizationDisplayName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">Università di Pisa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">University of Pisa</md:OrganizationDisplayName>
+    <md:OrganizationURL xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">http://www.unipi.it</md:OrganizationURL>
+    <md:OrganizationURL xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">http://www.unipi.it/english</md:OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Technical Support</SurName>
+    <EmailAddress>idem@unipi.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Samuele</GivenName>
+    <SurName>Tognini</SurName>
+    <EmailAddress>samuele.tognini@unipi.it</EmailAddress>
+  </ContactPerson>
+  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <md:GivenName>Davide</md:GivenName>
+    <md:SurName>Vaghetti</md:SurName>
+    <md:EmailAddress>davide.vaghetti@unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br.xml
new file mode 100644
index 00000000..a1da9093
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unoesc.edu.br.xml
@@ -0,0 +1,106 @@
+<?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.unoesc.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">unoesc.lan</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unoesc.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unoesc.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
+NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
+ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
+D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
+3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
+j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
+e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
+L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
+Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
+9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
+L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
+EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
+tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
+veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
+gjfpFw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.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">unoesc.lan</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
+NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
+ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
+D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
+3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
+j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
+e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
+L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
+Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
+9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
+L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
+EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
+tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
+veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
+gjfpFw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
+    <OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Adalberto Freiberger</SurName>
+    <EmailAddress>ctic.jba@unoesc.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vib.be.xml b/swamid-interfederations-2.0/idp.vib.be.xml
index 685ce972..ccffbee7 100644
--- a/swamid-interfederations-2.0/idp.vib.be.xml
+++ b/swamid-interfederations-2.0/idp.vib.be.xml
@@ -1,8 +1,24 @@
 <?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.vib.be/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.vib.be/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">vib</shibmd:Scope>
+      <shibmd:Scope regexp="false">belnet.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">VIB</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vlaams Instituut voor Biotechnologie</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/jpg;base64,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AAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSwAAAAYAAAAAAAAAAAAAABAAAAAQAAAACwBWAEkAQgBfAHIAZwBiAF8AcABvAHMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAQAAAAAFJnaHRsb25nAAAAEAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAF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ZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcFJpZ2h0cz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3JpZ2h0cy8iIHBob3Rvc2hvcDpMZWdhY3lJUFRDRGlnZXN0PSI0NjBDRjI4OTI2Qjg1NkRBQjA5QzAxQTFCMEE3OTA3NyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1MgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAwNy0wMi0yOFQxNjozNDoxNyswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcE1NOkRvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUNBNDA5NDg1RERGRTMxMUI5QzdBRTkzN0QxOEM4QzAiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0RUM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiB4bXBSaWdodHM6TWFya2VkPSJGYWxzZSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjU4N0M3RTREQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRDQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIi8+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQTQwOTQ4NURERkUzMTFCOUM3QUU5MzdEMThDOEMwIiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE1OjU1OjQ4KzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIABAAEAMBEQACEQEDEQH/3QAEAAL/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AD77t2Vvjc2+u0ZI/kr3lLuWl7Z7Kx2Wx+M6U74/glQlHufORT5Xb+b6833vLa1OJsinipcWggMMGlmmUqUPSjZOYt+5Y5e5UteZva7lNrP9z2rJdSbvtlk09YIyjPDfxQvGzoRqXU/fkOynV1xa5s5L5S5w5r553rlf395ytL08x3qPt/7jvrtLYLcyrIEuLC4uFnjR1OlykRKHMSONHRw9q9M9j1Hxi6c312V2f1lV7a6W3F2L2uuU2hsbsLqbtXv3aNRRt11R03e20INy7RzHX3cGy+wcnQTfximyOcpaqvwkCzUvhqZoPeF9pufM3+ubuUHK+5sm67jLJas3iWl+vhvVZIxNHG9tPEqrSOSJVoANDYq3STc+Xvb+f2R2O55t2WK65Z2eGLcIVjF5Y1mioyXCxmZLiCWWQlpYpXdTqYOpwF//0L88X01jOz+2vkDtPfOAz+L7F6Y3v2pvPu3HVu7tyJ1/hetcvjs3vPoDdXXdVTsMdlafu+kqI6iopp5xPgWw+Zo51V4Kc1GNHuZ9032i9xd4/f0Vrf7ducsbG5Z7qfczczvKjmfVfyP9OFTxEjt7dVgVXUBaxo/QN2nlK4spN0G68yXF7bTXbSxIkaWawRuHrAFtWVZKSMsnjvWZylGOmR16AfM7y2bszpD41UuD2DQT7M3V8VumPn9urFbKzOSyHZGQpaj5F9SZndm0K7cyCs3B2Rtvbm7O+azeNQtXR5b+IVeBWlixLSyUgglnk32927lflifkfc9wl3DkuHbks7G0gU7S1kIpUkinS6sJVuGdVQq8epRK7PK0gd26Vb5sG4blttntW1cxvt8CSxmU/TW9348SKC0LJcAqnjSgO0oJdAWQBhg//9k=</mdui:Logo>
+        <mdui:Logo height="128" width="128">data:image/jpg;base64,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////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAA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eGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>193.191.128.0/24</mdui:IPHint>
+        <mdui:DomainHint>vib.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.018402,3.691419</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -42,7 +58,7 @@ VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope regexp="false">vib</shibmd:Scope>
+      <shibmd:Scope regexp="false">vib.be</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -81,7 +97,7 @@ VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
 VIB
 </OrganizationName>
     <OrganizationDisplayName xml:lang="en">
-VIB - VLaams Instituut voor Biotechnologie
+VIB - Vlaams Instituut voor Biotechnologie
 </OrganizationDisplayName>
     <OrganizationURL xml:lang="en">
 http://www.vib.be
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml
new file mode 100644
index 00000000..147973f4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.zid.tuwien.ac.at/saml2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Technische Universität Wien</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vienna University of Technology</mdui:DisplayName>
+        <mdui:Logo height="92" width="95">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</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>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php" ResponseLocation="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Technische Universität Wien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vienna University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Wien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vienna University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.tuwien.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tuwien.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Georg</md:GivenName>
+    <md:SurName>Gollmann</md:SurName>
+    <md:EmailAddress>mailto:gollmann@zid.tuwien.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
index b0cea5b1..2926376b 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
-  <!--
-		This is a "SDSS (Fountainhall)" project test IdP running outside the University environment for Ian A. Young.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br.xml
new file mode 100644
index 00000000..23df3ae4
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.ufjf.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.ufjf.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">ufjf.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufjf.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufjf.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
+Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
+A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
+WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
+SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
+IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
+1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
+RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
+9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
+9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
+1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
+u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
++laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
+4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
+IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
+VHUsC0A0Nd9rEkuwkV0GdA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.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">ufjf.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
+Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
+A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
+WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
+SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
+IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
+1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
+RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
+9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
+9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
+1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
+u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
++laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
+4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
+IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
+VHUsC0A0Nd9rEkuwkV0GdA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufjf.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufjf.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jose Luiz Ribeiro de Souza Filho</SurName>
+    <EmailAddress>engenharia.redes@ufjf.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
index dc6abb96..df54c89c 100644
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
@@ -43,40 +43,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
index da4b6342..7ac7acc4 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
-  <!--
-		This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz.xml b/swamid-interfederations-2.0/katalog.svkos.cz.xml
index 10a4f5fb..984c5d2c 100644
--- a/swamid-interfederations-2.0/katalog.svkos.cz.xml
+++ b/swamid-interfederations-2.0/katalog.svkos.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md: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>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
index bc0847bf..a88495cf 100644
--- a/swamid-interfederations-2.0/login-idp.auth.gr.xml
+++ b/swamid-interfederations-2.0/login-idp.auth.gr.xml
@@ -13,89 +13,60 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aristotle University of Thessaloniki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.auth.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.auth.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>auth.gr</mdui:DomainHint>
+        <mdui:IPHint>155.207.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.104.147.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2800::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:40.6308255004333, 22.959268014038116</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
-                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
-                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
-                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
-                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
-                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
-                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
-                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
-                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
-                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
-                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
-                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
-                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
-                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
-                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
-                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
-                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
-                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
-                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
-                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
-                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
-                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
-                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
-                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
-                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
-                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
-                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
-                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
-                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
-                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
-                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
-                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
-                        </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>
-                            MIIGmTCCBYGgAwIBAgIIEpesHsDp050wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
                             BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
                             SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
                             IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NDA3MDAwMDAwWhcNMTYwNDA2MDQxMjA3WjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
                             ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
                             EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSQ4x6t
-                            XTCDG7qOrPzabp0Z3H998X+MxjlY8ClW3YhjmExFPREEqJxhJPesLJlX9va+rBE9
-                            zfhr6HXExNSeMfrTTx3/dYG8VFP8AeSbZ+a3AKwQ2j+TqJTGa87CCbFExN7wYxBV
-                            jT2DwT9AtqNpCWPqvBpws+6rtzaaZbxkdN2zxBp+9BAXUy70ZUY2XyZLey26LVw6
-                            M1DRlqJTxMJzSXhIN9VDAW+mBTfwUItCtDU1qlMzCb8cF5Z64WuUHlZ2gxVt+bCM
-                            0txDwHsmaJsX3kmMNgxZIJfYMUy0+fnkXsheUF21fdscfbwH0Z06OkWVkRGsDA+S
-                            QuN/j3mFCTOrSKUCAwEAAaOCAwUwggMBMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQD
-                            AgWgMDsGA1UdJQQ0MDIGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsG
-                            AQUFBwMGBggrBgEFBQcDBzAdBgNVHQ4EFgQUJBBlBSvj16AfytJXxcQCnhbIwsEw
-                            HwYDVR0jBBgwFoAU9ZMXSh1ztn9/ILKlFJRXchkzNtIwcQYIKwYBBQUHAQEEZTBj
-                            MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjA8BggrBgEFBQcw
-                            AoYwaHR0cDovL3d3dy5wa2kuYXV0aC5nci9jZXJ0cy9BdXRoQ2VudHJhbENBUjQu
-                            cGVtMEcGA1UdHwRAMD4wPKA6oDiGNmh0dHA6Ly9jcmx2MS5wa2kuYXV0aC5nci9B
-                            dXRoQ2VudHJhbENBUjQvY3JsdjEuZGVyLmNybDCCASAGA1UdIASCARcwggETMIIB
-                            DwYLKwYBBAG8HQIAAwUwgf8wNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1
-                            dGguZ3IvZG9jdW1lbnRzL0NQUy5waHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0
-                            b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0
-                            aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRo
-                            aXMgQ2VydGlmaWNhdGUgbXVzdCBvbmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCBy
-                            ZXNlYXJjaCBvciBlZHVjYXRpb25hbCBwdXJwb3Nlcy4wgYYGA1UdEQR/MH2CEWxv
-                            Z2luLWlkcC5hdXRoLmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRw
-                            MS5pdC5hdXRoLmdyghBsb2dpbi1pZHAxLml0LmdyghVsb2dpbi1pZHAyLml0LmF1
-                            dGguZ3KCEmxvZ2luLWlkcDIuYXV0aC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAgzAL
-                            I1gI5/zOFbX6mMd46r6HcZQ2y+41uqe9achTBo8ycAe3jA5dHwL+dqjN0uFdOBNJ
-                            Le3vKPVghDqLw9dH52fxN6QTZnASfsSwkOy/uDAet4fh1c21U/I0V9Rg1Us4cQEG
-                            XM4jJ4mKcqIFibLGUWPfB94PLrNaQWVTVIKvsdkh/KLnmVUzKk5U9dMBerOflaT4
-                            atG51Hc+xpew/M93F2l2D0Vr+3LT6/BCA4WvCq3Ey1ZRBmdYMlADdkMskfAuD7GL
-                            pGQ/TY7ZLImfjwUXTBODgqfbj9Dv4EegfY9HLhT/yVckllXZhK05fTgi/BCkgXAb
-                            AzqiLvGn8wTWlVZYZA==
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
+                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
+                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
+                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
+                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
+                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
+                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
+                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
+                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
+                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
+                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
+                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
+                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
+                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
+                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
+                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
+                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
+                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
+                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
+                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
+                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
+                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
+                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
+                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
+                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
+                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
+                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
+                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
+                            z6v6NL8x
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -117,84 +88,42 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
-                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
-                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
-                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
-                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
-                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
-                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
-                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
-                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
-                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
-                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
-                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
-                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
-                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
-                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
-                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
-                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
-                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
-                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
-                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
-                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
-                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
-                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
-                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
-                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
-                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
-                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
-                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
-                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
-                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
-                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
-                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
-                        </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>
-                            MIIGmTCCBYGgAwIBAgIIEpesHsDp050wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
                             BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
                             SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
                             IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NDA3MDAwMDAwWhcNMTYwNDA2MDQxMjA3WjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
                             ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
                             EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSQ4x6t
-                            XTCDG7qOrPzabp0Z3H998X+MxjlY8ClW3YhjmExFPREEqJxhJPesLJlX9va+rBE9
-                            zfhr6HXExNSeMfrTTx3/dYG8VFP8AeSbZ+a3AKwQ2j+TqJTGa87CCbFExN7wYxBV
-                            jT2DwT9AtqNpCWPqvBpws+6rtzaaZbxkdN2zxBp+9BAXUy70ZUY2XyZLey26LVw6
-                            M1DRlqJTxMJzSXhIN9VDAW+mBTfwUItCtDU1qlMzCb8cF5Z64WuUHlZ2gxVt+bCM
-                            0txDwHsmaJsX3kmMNgxZIJfYMUy0+fnkXsheUF21fdscfbwH0Z06OkWVkRGsDA+S
-                            QuN/j3mFCTOrSKUCAwEAAaOCAwUwggMBMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQD
-                            AgWgMDsGA1UdJQQ0MDIGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsG
-                            AQUFBwMGBggrBgEFBQcDBzAdBgNVHQ4EFgQUJBBlBSvj16AfytJXxcQCnhbIwsEw
-                            HwYDVR0jBBgwFoAU9ZMXSh1ztn9/ILKlFJRXchkzNtIwcQYIKwYBBQUHAQEEZTBj
-                            MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjA8BggrBgEFBQcw
-                            AoYwaHR0cDovL3d3dy5wa2kuYXV0aC5nci9jZXJ0cy9BdXRoQ2VudHJhbENBUjQu
-                            cGVtMEcGA1UdHwRAMD4wPKA6oDiGNmh0dHA6Ly9jcmx2MS5wa2kuYXV0aC5nci9B
-                            dXRoQ2VudHJhbENBUjQvY3JsdjEuZGVyLmNybDCCASAGA1UdIASCARcwggETMIIB
-                            DwYLKwYBBAG8HQIAAwUwgf8wNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1
-                            dGguZ3IvZG9jdW1lbnRzL0NQUy5waHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0
-                            b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0
-                            aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRo
-                            aXMgQ2VydGlmaWNhdGUgbXVzdCBvbmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCBy
-                            ZXNlYXJjaCBvciBlZHVjYXRpb25hbCBwdXJwb3Nlcy4wgYYGA1UdEQR/MH2CEWxv
-                            Z2luLWlkcC5hdXRoLmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRw
-                            MS5pdC5hdXRoLmdyghBsb2dpbi1pZHAxLml0LmdyghVsb2dpbi1pZHAyLml0LmF1
-                            dGguZ3KCEmxvZ2luLWlkcDIuYXV0aC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAgzAL
-                            I1gI5/zOFbX6mMd46r6HcZQ2y+41uqe9achTBo8ycAe3jA5dHwL+dqjN0uFdOBNJ
-                            Le3vKPVghDqLw9dH52fxN6QTZnASfsSwkOy/uDAet4fh1c21U/I0V9Rg1Us4cQEG
-                            XM4jJ4mKcqIFibLGUWPfB94PLrNaQWVTVIKvsdkh/KLnmVUzKk5U9dMBerOflaT4
-                            atG51Hc+xpew/M93F2l2D0Vr+3LT6/BCA4WvCq3Ey1ZRBmdYMlADdkMskfAuD7GL
-                            pGQ/TY7ZLImfjwUXTBODgqfbj9Dv4EegfY9HLhT/yVckllXZhK05fTgi/BCkgXAb
-                            AzqiLvGn8wTWlVZYZA==
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
+                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
+                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
+                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
+                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
+                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
+                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
+                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
+                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
+                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
+                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
+                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
+                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
+                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
+                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
+                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
+                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
+                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
+                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
+                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
+                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
+                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
+                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
+                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
+                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
+                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
+                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
+                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
+                            z6v6NL8x
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -213,13 +142,13 @@
     <OrganizationURL xml:lang="el">http://www.auth.gr/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>support@auth.gr</EmailAddress>
+    <Company>AUTH IT Center AAI Administrators</Company>
+    <EmailAddress>aaiadmin@it.auth.gr</EmailAddress>
+    <TelephoneNumber>+30-2310999000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Network Operations Center</SurName>
+    <Company>AUTH IT Center Helpdesk</Company>
     <EmailAddress>support@auth.gr</EmailAddress>
+    <TelephoneNumber>+30-2310999000</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr.xml b/swamid-interfederations-2.0/login.aaiedu.hr.xml
index 4e46a51c..9dc17de2 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr.xml
@@ -1,239 +1,239 @@
 <?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://login.aaiedu.hr/edugain/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/edugain/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">acmt.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">adu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">agr.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">alu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">apuri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">arhitekt.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">arhiv.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">asoo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">aspira.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">azoo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">azvo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bernays.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bfm.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bicro.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">boginst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bolnica-karlovac.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">bolnica-zadar.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">carnet.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">dhz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">diplomacija.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">diu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">djkbf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">dkd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">efos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">efri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">efst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">efzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">eihp.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">eizg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">erf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">etfos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">evtos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fer.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fesb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffdi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fkit.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fkz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">foi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fpz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fpzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fsb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">fthm.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ftidi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">galapagos-ic.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">geof.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gfos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gfv.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gkka.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gkpz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gkri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gkvk.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gkzd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">grad.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gradri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gradst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">grf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">gskos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">h-r-z.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hatz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hazu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hck.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hera.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hgi-cgs.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hhi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hpm.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hrbi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hrstud.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hrzz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hsin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">hzjz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">iarh.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">idb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">idi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ief.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ifs.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ifzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">igh.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ihjj.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ijf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">imi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">imin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">imz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">inantro.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">iptpo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ipu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ipv-zg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">irb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">irmo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">isp.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">izor.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">iztzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kb-merkur.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbc-rijeka.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbc-zagreb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbcsm.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbf-st.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbsd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kbsplit.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kif.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">kifst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">koncar-institut.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">krs.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ktf-split.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">lzmk.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">matica.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">medils.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">medri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mef.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mefos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mefst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mev.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mobilnost.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">muza.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">mzos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ncvvo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">nsk.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">nsz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">obhpknin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">oikon.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pak.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">par.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pbf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pfos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pfri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pfst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pharma.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pilar.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pmf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pmfst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">politehnika-pula.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">poljinos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pou-amc.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pou.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pozeska-bolnica.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pravo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pravos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pravri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">pravst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ptfos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">public.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">racunarstvo.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">rgn.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">riteh.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">scri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">scsi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">scst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">scvz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">sczg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfsb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">simet.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">skolski-sport.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">snz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">srce.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">stampar.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">stin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">stucos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">stucsb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">sumfak.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">sumins.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">suvag.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">svkatarina.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">svkri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">svkst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">tcs.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">tera.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">tfmvi.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ticri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ttf.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">tvz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">uaos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ufos.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ufri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">ufzg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">umas.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unicath.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unidu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unios.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unipu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">uniri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unist.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unizd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">unizg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vef.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">veinst.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">veleknin.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">veleri.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vernnet.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vevu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vguk.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vhzk.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vps-libertas.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vps-minerva.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vpsvisnjan.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vpsz.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vsa.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vsfp.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vsikmp.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vsite.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vsmti.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vspu.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vss.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vszrinski.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vtsbj.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vuka.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vup.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vus.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vusb.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">vvg.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">zkzd.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">zsem.hr</shibmd:Scope>
-      <shibmd:Scope regexp="false">zvu.hr</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acmt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agr.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apuri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhitekt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhiv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspira.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bernays.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bicro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boginst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-karlovac.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-zadar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diplomacija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">djkbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eihp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evtos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fer.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fesb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffdi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fthm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ftidi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">galapagos-ic.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geof.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkvk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grad.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">h-r-z.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hatz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hazu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hck.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgi-cgs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hpm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrbi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ief.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">igh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihjj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inantro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iptpo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipv-zg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irmo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izor.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iztzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb-merkur.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-rijeka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-zagreb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbcsm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf-st.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsplit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kifst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koncar-institut.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">krs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktf-split.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mev.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mobilnost.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muza.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncvvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obhpknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oikon.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">par.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pharma.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pilar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politehnika-pula.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poljinos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou-amc.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pozeska-bolnica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">public.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racunarstvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgn.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riteh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scsi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sczg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skolski-sport.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srce.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stampar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumfak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumins.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suvag.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ticri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicath.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unidu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unios.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unist.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veinst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vernnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vevu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vguk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhzk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-libertas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-minerva.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsvisnjan.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsa.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsfp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsikmp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsite.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsmti.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vspu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vszrinski.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vtsbj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vup.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vus.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vusb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vvg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zsem.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvu.hr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
         <mdui:DisplayName xml:lang="hr">AAI@EduHr sustav jedinstvene autentikacije korisnika</mdui:DisplayName>
         <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
@@ -241,14 +241,14 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/login.fhv.at.xml b/swamid-interfederations-2.0/login.fhv.at.xml
index 0f7ebb70..e7719bb3 100644
--- a/swamid-interfederations-2.0/login.fhv.at.xml
+++ b/swamid-interfederations-2.0/login.fhv.at.xml
@@ -2,7 +2,7 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fhv.at/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi.xml
index 986ba144..1ea67fec 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+<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" entityID="https://login.helsinki.fi/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
@@ -40,30 +41,30 @@ NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
 Ahw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Peltonen</md:SurName>
-    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Juha</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
+    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
+    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Peltonen</SurName>
+    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Juha</GivenName>
+    <SurName>Niemi</SurName>
+    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se.xml b/swamid-interfederations-2.0/login.idp.hhs.se.xml
new file mode 100644
index 00000000..a25f5b38
--- /dev/null
+++ b/swamid-interfederations-2.0/login.idp.hhs.se.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.idp.hhs.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
+        <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
+        <mdui:DomainHint>hhs.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
+WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
+PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
+nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
+t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
+mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
+PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
+Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
+s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
+3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
+sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
+Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
+Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
+UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se: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://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
+WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
+PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
+nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
+t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
+mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
+PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
+Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
+s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
+3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
+sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
+Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
+Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
+UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se: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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">HHS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hhs.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Handelshögskolan i Stockholm</Company>
+    <EmailAddress>itsupport@hhs.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org.xml
index 71ce739b..c4b297e9 100644
--- a/swamid-interfederations-2.0/monitor.eduroam.org.xml
+++ b/swamid-interfederations-2.0/monitor.eduroam.org.xml
@@ -1,26 +1,27 @@
 <?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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
@@ -28,7 +29,7 @@
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
       <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
@@ -41,6 +42,10 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Dubravko</md:GivenName>
     <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>monitor@eduroam.org</md:EmailAddress>
+    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>eduroam operations team</md:Company>
+    <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
index 8cc59d03..f3830d86 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
@@ -54,6 +54,7 @@ M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 8e67777f..0d66e714 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
         </ds:X509Data>
@@ -12,24 +32,27 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:Company>UNINETT AS</md:Company>
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Solberg</md:SurName>
-    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
-    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
index 33a0d19e..152c3742 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
-        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
+      <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: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://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -49,45 +52,36 @@ wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
 ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
 JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
 EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
-    <md:SurName>INL</md:SurName>
-    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>servicedesk@inl.nl</md:GivenName>
-    <md:SurName>INL</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
+      <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>System</GivenName>
+    <SurName>Management</SurName>
+    <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Service</GivenName>
+    <SurName>Desk</SurName>
+    <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
index 162bb663..7b9c5700 100644
--- a/swamid-interfederations-2.0/qub.ac.uk.xml
+++ b/swamid-interfederations-2.0/qub.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qub.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Queen's University of Belfast.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
index 51ed22fd..42229862 100644
--- a/swamid-interfederations-2.0/quod.lib.umich.edu.xml
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://quod.lib.umich.edu/shibboleth-sp/acls">
-  <!--
-		This is a Shibboleth 2 'ACLS Humanities E-Book' SP owned by the University of Michigan.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml b/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml
new file mode 100644
index 00000000..ade79d7c
--- /dev/null
+++ b/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml
@@ -0,0 +1,112 @@
+<?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://rastreador.ifba.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">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifba.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifba.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
+SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
+dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
+dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
+MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
+aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
+aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
+MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
+1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
+6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
+WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
+1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
+FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
+9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
+fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
+hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
+Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
+NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.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>
+      
+MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
+SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
+dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
+dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
+MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
+aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
+aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
+MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
+1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
+6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
+WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
+1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
+FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
+9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
+fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
+hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
+Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
+NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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">IFBA - Instituto Federal da Bahia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifba.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Reinaldo Fonseca</SurName>
+    <EmailAddress>reinaldocosta@ifba.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registration.dariah.eu.xml b/swamid-interfederations-2.0/registration.dariah.eu.xml
new file mode 100644
index 00000000..3b426353
--- /dev/null
+++ b/swamid-interfederations-2.0/registration.dariah.eu.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registration.dariah.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-05-15T11:08:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </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://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Registration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Registration</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</mdui:Description>
+        <mdui:Description xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</mdui:Description>
+        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
+aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
+q1AZvg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">DARIAH Registration</ServiceName>
+      <ServiceName xml:lang="en">DARIAH Registration</ServiceName>
+      <ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</ServiceDescription>
+      <ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Haase</SurName>
+    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Martin</GivenName>
+    <SurName>Haase</SurName>
+    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Martin</GivenName>
+    <SurName>Haase</SurName>
+    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
index cd9489c2..4eaceaa3 100644
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
@@ -33,40 +33,9 @@
         <ds:KeyName>www.chain-project.eu</ds:KeyName>
         <ds:KeyName>www.special-project.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/rir.dariah.eu.xml b/swamid-interfederations-2.0/rir.dariah.eu.xml
index 0efbecd5..3dc2d159 100644
--- a/swamid-interfederations-2.0/rir.dariah.eu.xml
+++ b/swamid-interfederations-2.0/rir.dariah.eu.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -17,6 +22,7 @@
         <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
         <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 5c5d5cb3..52415d75 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
@@ -13,12 +23,8 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
@@ -53,104 +59,104 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
 7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kari</md:GivenName>
-    <md:SurName>Laalo</md:SurName>
-    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <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://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
+      <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
+      <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
+      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="true"/>
+      <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Kari</GivenName>
+    <SurName>Laalo</SurName>
+    <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Timo</GivenName>
+    <SurName>Mustonen</SurName>
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu.xml b/swamid-interfederations-2.0/search.de.dariah.eu.xml
index 35e5d35b..c2382cfd 100644
--- a/swamid-interfederations-2.0/search.de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/search.de.dariah.eu.xml
@@ -5,6 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -16,6 +21,7 @@
         <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
         <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
index 5164f2a5..e2963802 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
-  <!--
-		This is a Shib Test SP owned by Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index d9b4bb4d..4a14e4df 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
index acc8dee3..51b48160 100644
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
@@ -19,6 +19,39 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
+BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
+wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
+eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
+EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
+Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
+OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
+4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
+H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
+U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
+XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
+fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
+					    </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>
 					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
@@ -48,40 +81,6 @@ y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
-BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
-w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
-9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
-UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
-WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
-3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
-jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
-9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
-VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
-Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
-MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
-ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
-Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
-o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
-kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
-Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
-0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
-rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
-NA==
-					    </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>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
@@ -96,6 +95,39 @@ NA==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
+BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
+wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
+eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
+EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
+Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
+OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
+4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
+H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
+U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
+XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
+fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
+					    </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>
 					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
@@ -125,40 +157,6 @@ y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
-BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
-w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
-9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
-UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
-WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
-3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
-jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
-9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
-VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
-Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
-MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
-ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
-Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
-o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
-kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
-Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
-0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
-rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
-NA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.fr/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>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
index f456acf5..32a0ddcf 100644
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
@@ -2,7 +2,7 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fhwn.ac.at/idp/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at.xml
new file mode 100644
index 00000000..f9e367f8
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.im.jku.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-08-11T10:50:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">jku.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Johannes Kepler Universität Linz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Johannes Kepler University Linz</mdui:DisplayName>
+        <mdui:Logo height="183" width="385">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
+        <mdui:Logo height="92" width="193">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks_50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.im.jku.at/logos/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
+Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
+a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
+O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
+M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
+Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
+4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
+KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
+2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
+hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
+CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
+lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
+mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
+j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
+AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
+lkm+eYJRFwZraUdycAffqQ==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.im.jku.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/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">jku.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
+Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
+a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
+O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
+M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
+Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
+4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
+KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
+2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
+hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
+CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
+lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
+mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
+j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
+AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
+lkm+eYJRFwZraUdycAffqQ==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Linz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University Linz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Johannes Kepler Universität Linz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Johannes Kepler University Linz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.jku.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.jku.at/setCookieFromQuery?language=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Server</md:GivenName>
+    <md:SurName>Systems</md:SurName>
+    <md:EmailAddress>mailto:serveradmin@jku.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
index 1a3ee5fc..6eb513b5 100644
--- a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
index 0f51176c..b0f15f2f 100644
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md: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>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
index 2c5f1baf..44f37f3a 100644
--- a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
@@ -5,6 +5,11 @@
       <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
   </md: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>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
index 4ced22cd..e114a2bb 100644
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
@@ -17,6 +17,10 @@
         <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index eb77557b..5a862cc4 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,25 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Catalog Clarin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Catalog Clarin</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Catalog Clarin</mdui:Description>
-        <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
-        <mdui:Keywords xml:lang="en">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
-        <mdui:Keywords xml:lang="fi">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </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://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+        <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
+SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
+aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
+ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
+R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
+EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
+SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
+EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
+R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
+UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
+bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
+IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
+A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
+Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
+ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
+yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
+gDLbA/e0dbDclBvxUIm9cemA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
 TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
 SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
@@ -39,36 +77,56 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
 Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
 ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical support</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
+      <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
+      <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
+      <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Daan</GivenName>
+    <SurName>Broeder</SurName>
+    <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>van Valkenhoef</SurName>
+    <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index d2dba0bc..09741a34 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,91 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.corpus1.mpi.nl">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
-        <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-08T21:53:28Z">
+      <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://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
-VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
-H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
-gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
-WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
-YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
-AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
-AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
-4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
-VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
-bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
-T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
-a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
-c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
-/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
-LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</md:ServiceName>
-      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:corpman@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>General</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
index 1c22a346..8430879b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/kbplus">
-  <!--
-		This is an "EDINA Knowledge Base+" SP for the University of Edinburgh.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
index 45933ebd..147f3e7e 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="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://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
@@ -14,12 +24,8 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
@@ -48,42 +54,42 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
 5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
-      <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fin-Clarin</md:GivenName>
-    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jyrki</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</ServiceName>
+      <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
+      <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Fin-Clarin</GivenName>
+    <EmailAddress>mailto:fin-clarin@helsinki.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Matthiesen</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Jyrki</GivenName>
+    <SurName>Niemi</SurName>
+    <EmailAddress>mailto:jyrki.niemi@helsinki.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 6db70753..cb70909f 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
@@ -16,12 +26,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
@@ -50,42 +56,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
 TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
-      <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tero</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tero</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
+      <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
+      <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
+      <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Tero</GivenName>
+    <SurName>Aalto</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Matthiesen</SurName>
+    <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Tero</GivenName>
+    <SurName>Aalto</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 4f14f4fd..f1f30699 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,102 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-04-27T09:05:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </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://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+        <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <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:X509Certificate>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <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:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>van Valkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</ServiceName>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</ServiceName>
+      <ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</ServiceDescription>
+      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</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"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Lat</GivenName>
+    <SurName>Admin</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
new file mode 100644
index 00000000..ae30eae8
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onlinelibrary.wiley.com/shibboleth">
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-27T11:15:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows Wiley Online Library users to use login credentials at their home organisations</mdui:Description>
+        <mdui:Logo height="60" width="74">https://sp.onlinelibrary.wiley.com/images/WOL_Stacked_k.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://sp.onlinelibrary.wiley.com/images/WOL_favicon.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS"/>
+      <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://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFZDCCBEygAwIBAgIQdUiWyjcBa6ojf+8p2ZlNmDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNjE5
+						MDAwMDAwWhcNMTQwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+						Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
+						bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
+						VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOs4Cqr0HKFvnLBLxwlxmtNhwxm6zqHdV5A3KQ6m+8Aq
+						1TMlcCVRaRZLvO5mhex5NM9sqLLQEvLyA/U/WWA9gdmOcCRBgJm2AxDF13aCZBdw
+						SVh+Ltg4JnyraA5zoHCEaGJZ74YkTmPMbgef53ewjqo3tYmKmZkeOW3PAOUUmTSq
+						UX7EKAGe79KzStrT1tt7QYS0+nGMLvneOclxwDy7QGP+CIjJ4taYL3CQNcOPDMyX
+						sPDuNwEUO0Ae6b+kilpW5UbmnJXgSpGkBIONFLjzyKXouzNgfN97G4qFoK/9eLpE
+						Ih6ODcG/apYsPe/LqToBHB7uFgjYvuGc1UeRA/AgTk8CAwEAAaOCAYswggGHMCUG
+						A1UdEQQeMByCGnNwLm9ubGluZWxpYnJhcnkud2lsZXkuY29tMAkGA1UdEwQCMAAw
+						DgYDVR0PAQH/BAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1
+						cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0w
+						OzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJp
+						c2lnbi5jb20vY3BzMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
+						HSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYI
+						KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0
+						aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcz
+						LmNlcjANBgkqhkiG9w0BAQUFAAOCAQEAGqTBq1WXDafEAgzJHv7lHHV+O/yxDzV5
+						laVoka0BWCUXftND0Oz6v+sWfmoDNh5ADd2tD35sjryz3nG9TptgH1dLfmrSMxjl
+						tqe73rWr3JODmy5MpPag5ySokwLIBc/IoEn4hfJRprYyot6oNci4NrZRq+WeKEnL
+						Pc25ODh73EylMtAQf0zcvEeX5giIe90UUaU0VbzPELf9UXrNE+tfizINp2mDDvbm
+						C+1c1QWOmBKozNPPDdADAiHThaig5zy6pwJgwkB0Nbv4fw3A+Y+jO94rwUprxcDh
+						k4JNA4WrmEwBMbJxoQXtF25/lFXWSVM6A94w88q3s5OrpqU8NdWuKA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</ServiceName>
+      <ServiceDescription xml:lang="en">
+				This service allows Wiley Online Library users to use login credentials at their home organisations.
+			</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">John Wiley &amp; Sons Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://wiley.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Zhiming</GivenName>
+    <SurName>Chen</SurName>
+    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Zhiming</GivenName>
+    <SurName>Chen</SurName>
+    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br.xml b/swamid-interfederations-2.0/srvcafe.uniso.br.xml
new file mode 100644
index 00000000..bb200bc5
--- /dev/null
+++ b/swamid-interfederations-2.0/srvcafe.uniso.br.xml
@@ -0,0 +1,112 @@
+<?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://srvcafe.uniso.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">uniso.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNISO - Universidade de Sorocaba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNISO - Universidade de Sorocaba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uniso.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uniso.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
+VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
+9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
+YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
+Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
+MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
+A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
+LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
+sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
++mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
+wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
+5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
+c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
+gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
+OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
+u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
+IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
+tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.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">uniso.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
+VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
+9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
+YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
+Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
+MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
+A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
+LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
+sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
++mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
+wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
+5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
+c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
+gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
+OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
+u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
+IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
+tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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">Universidade de Sorocaba</OrganizationName>
+    <OrganizationName xml:lang="pt-br">Universidade de Sorocaba</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uniso.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uniso.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>William A Oliveira</SurName>
+    <EmailAddress>william.oliveira@uniso.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index 979f5b29..34d5dd47 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+<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" entityID="https://sso.utu.fi/sso-idp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
@@ -56,35 +57,35 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
 8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tuomas</md:GivenName>
-    <md:SurName>Honkala</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petri</md:GivenName>
-    <md:SurName>Teraspuro</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Elina</md:GivenName>
-    <md:SurName>Toivanen</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
+    <OrganizationName xml:lang="en">University of Turku</OrganizationName>
+    <OrganizationName xml:lang="sv">Åbo universitet</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Åbo universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tuomas</GivenName>
+    <SurName>Honkala</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Petri</GivenName>
+    <SurName>Teraspuro</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Elina</GivenName>
+    <SurName>Toivanen</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..3b1161df 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
index e351d63e..15c98b5a 100644
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
+++ b/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-bod-gui.geant.net/autobahn-gui">
-  <!--
-		This is a "BoD Portal" autobahn-gui 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-05-08T15:01:29Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
index f2627d6f..3acfb604 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
-  <!--
-		This is a UK federation Shibboleth 2 test SP.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
index fdee8bc4..f3962283 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.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://uat-adfs.geant.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-02-11T17:06:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
index 8d1fdc15..4301e427 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
-  <!--
-		This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
index 8b7b2688..4516009c 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -1,25 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+      <mdasrt:Attribute xmlns:mdasrt="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">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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 AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
-        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
+        <mdui:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka na Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
+    </Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -45,43 +77,65 @@ fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
 k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
 sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
 adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+IhAZYQU=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
-      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Jozef</md:GivenName>
-    <md:SurName>Misutka</md:SurName>
-    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Straňák</md:SurName>
+    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Jozef</md:GivenName>
-    <md:SurName>Misutka</md:SurName>
-    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 3391120a..68a8af8e 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
+<md:EntityDescriptor xmlns: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://wayf.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
       <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
@@ -169,12 +173,20 @@
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">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>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-      </saml:Attribute>
+      <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -202,4 +214,9 @@
     <md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 14fee192..555f7bcc 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,84 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
-      </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
-BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
-BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
-LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
-YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
-liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
-4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
-3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
-Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
-/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
-bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
-zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
-BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
-MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
-L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
-BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
-BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
-uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
-YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
-+Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
-kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
-NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
+R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
+aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
+wjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJVHVlYmluZ2VuMR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgVHVlYmluZ2Vu
+MQwwCgYDVQQLEwNTZlMxJjAkBgNVBAMTHXdlYmxpY2h0LnNmcy51bmktdHVlYmlu
+Z2VuLmRlMSswKQYJKoZIhvcNAQkBFhx3bGFkbWluQHNmcy51bmktdHVlYmluZ2Vu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KsTGSUCY/epaymY
+W3kqRl84RcNArc5w05x0rEi1qQUpAL1V7K7rJ/p5ZnjxqEhXEqYZXWh0ebkYWgzZ
+jr1Bs3mV1XVJ/9HrwRSFcNdyyFPmmP3Glsaculyn3zIQ4UcPyLk/kRlg37rx5nKj
+m3DZdrk345mjHO6MknFMSuh2TosI0tNhaa4rrRMJTlcOVJpiVlAF/DSZgwPjI6Yl
+5aHKes43tkCx1LJxDRAz9i/DaW4HdYNcwW3A0qlkRKRZqqVwRCG3Z5b9qdSry6t0
+UmmXMLYAxaStHVBx8d3eYWURfMLbvnpGKwWl0XGZQcevA9SzWswdmF/3X7zAmVAQ
+4L2qUQIDAQABo4ICbjCCAmowOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
+EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU9cQi9vwBJfcH9+Ae
+ytdTniex90EwHwYDVR0jBBgwFoAUsMG7aDV/4tZBnBpxr+D8QTTNw6gwRgYDVR0R
+BD8wPYIdd2VibGljaHQuc2ZzLnVuaS10dWViaW5nZW4uZGWBHHdsYWRtaW5Ac2Zz
+LnVuaS10dWViaW5nZW4uZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEKgQKA+hjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+TAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0
+dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGZ9bLdCBVw1Txf0f59QvfPe
+Ic02a/QJieoXre844zW5ISZwp14vGy+yzk4BK1tSovtxwf/FHiC7Uoqi+T9cL7E5
+yBbP2Y6cBHJuxy4YyXLimJoO7NWBDW+MOQRN1HjI5KXTMhhzmI81iofZbBlZwCSe
+pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
+ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
+ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">WebLicht</ServiceName>
+      <ServiceName xml:lang="en">WebLicht</ServiceName>
+      <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+      <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e60</OrganizationName>
+    <OrganizationName xml:lang="en">e60</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
index 05356992..48674cd6 100644
--- a/swamid-interfederations-2.0/weblogin2.geant.net.xml
+++ b/swamid-interfederations-2.0/weblogin2.geant.net.xml
@@ -1,12 +1,14 @@
 <?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
new file mode 100644
index 00000000..8c5c586d
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.moonshot.ja.net/shibboleth">
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-23T10:58:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moonshot Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</mdui:Description>
+        <mdui:Logo height="300" width="300">https://wiki.moonshot.ja.net/download/thumbnails/786450/global.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJAI2lVwLRmJlYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHdpa2kubW9vbnNob3QuamEubmV0MB4XDTE0MDEyMjE1NTUyMloXDTI0MDEy
+						MDE1NTUyMlowHzEdMBsGA1UEAxMUd2lraS5tb29uc2hvdC5qYS5uZXQwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGUu/30A3CbAtbHJxdqCH3sOeEBRh
+						8zlXj4fg9hFnq+QGZFnprYbBGiJIlCrbESqX5xcJb1B36NbyW2G0FvUVzi6H+RlG
+						t686NKc+NIODcbf4YiOcvn9Ixaxmd2q4/9c/3FBXlFm60chf3hENK9hF6kaw4LUd
+						nXdkL6r4Ha2q2csGUSjWaPlS6azgn+Wx+KFE6AVdVRhhrkeuoU6qko+waPPjXjJG
+						gzIfBs45AYwb6t5rw+7oaKWeDMR1pIDa3YkhyvLpeesi+ZXW+CzzWPO7LK6ffedB
+						n4GOZkArOBo8y/KV6qt67w6wVujD9oW3bNTmt4zh6SPpK/qqUOPe4jZLAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHdpa2kubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQX
+						l8auIWrO6aWUz4kAMl1ft5iPLjANBgkqhkiG9w0BAQUFAAOCAQEAEQirkb8jdIye
+						bieiVOnSdkHSgR+9Nigf7DHEF0F1IXMVCKYONud2O4ospFignlg5UnPV1nrul6Fz
+						c681gz4a0mY0Rkhg0noTbsfDsxmeddWBl2exsS8aLfoMcLmN2XaAPoiyXkUB07VM
+						KfuD9TOWjaWBTUXGxqxvWxqYGyMqY/8K0YFmzOSlW3o38Wnal6BmBU70YdUeGpb9
+						k/GRL1yvGpuhK1LGzCdtu0tg/tpLDB6vYqAUJOI9A/0nnavZ8ZRb7qyUU8hnxbGK
+						njlrDErSFqTmSYL6RiJyx24bQfVdDporsXDSrMprH3B2SIIXNHMDNWxraXUDTtg1
+						0oPZBY6WCg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Moonshot Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Moonshot Wiki</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://wiki.moonshot.ja.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Adam</GivenName>
+    <SurName>Bishop</SurName>
+    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Adam</GivenName>
+    <SurName>Bishop</SurName>
+    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
index 48b067cb..5785126d 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
-  <!--
-		This is a "Shibboleth Federated Wiki" Shibboleth SP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index ba3c1f16..9182934b 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,32 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+      <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+      <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+      <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+      <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://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+      <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://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</ds:X509Certificate>
+          <ds:X509Certificate>
+						MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+						BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
+						ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
+						LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
+						0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
+						zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
+						0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
+						bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
+						obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
+						cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
+						aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
+						+zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
+						lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
+						yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
+						xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
+						uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
+						MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
-      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rob</GivenName>
+    <SurName>Wood</SurName>
+    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Laurence</GivenName>
+    <SurName>Parkin</SurName>
+    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com.xml
index 7edb7e2a..b7f59b00 100644
--- a/swamid-interfederations-2.0/www.knodium.com.xml
+++ b/swamid-interfederations-2.0/www.knodium.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.knodium.com/Shibboleth.sso/Metadata">
-  <!--
-		This is an SP for Knodium Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
index 5468f3e6..2c569b58 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
@@ -73,6 +73,7 @@ SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
index 53dbc143..ec8a588e 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.portal.euromonitor.com/shibboleth">
-  <!--
-		This is an OpenAthens service provider for Euromonitor International plc.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.qoam.eu.xml b/swamid-interfederations-2.0/www.qoam.eu.xml
new file mode 100644
index 00000000..d0bc6992
--- /dev/null
+++ b/swamid-interfederations-2.0/www.qoam.eu.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">QOAM</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="65" width="65">https://static.surfconext.nl/media/sp/OAmarket.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
+      <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>info@qoam.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Leo</md:GivenName>
+    <md:SurName>Waaijers</md:SurName>
+    <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
+    <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
index 7375a2b9..3b288ae0 100644
--- a/swamid-interfederations-2.0/www.scran.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.scran.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Scran" Shibboleth SP belonging to Scran Limited.
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
new file mode 100644
index 00000000..a69bb412
--- /dev/null
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
+        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+                            LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                            CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+                            DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+                            eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+                            bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+                            oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+                            tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+                            C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+                            AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+                            DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+                            L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+                            dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+                            BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+                            c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+                            aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+                            sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+                            RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+                            2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+                            CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
+                            EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+                            LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                            CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+                            DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+                            eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+                            bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+                            oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+                            tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+                            C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+                            AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+                            DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+                            L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+                            dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+                            BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+                            c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+                            aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+                            sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+                            RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+                            2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+                            CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
+                            EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">WiFi IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Massimo Del Sarto</md:SurName>
+    <md:EmailAddress>ced@fsm.unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ced@fsm.unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2014-06-11 09:14:00 +0200
committer	Leif Johansson <leifj@sunet.se>	2014-06-11 09:14:00 +0200
commit	60403c628280d09266fb55e298548d3cd6770954 (patch)
tree	d0cfdd91607d67ec5ad845ee2b25b3acc5f94106 /swamid-interfederations-2.0
parent	4ec37b7f0210ea8e785b70bdb9cf29d4c7bc93e2 (diff)