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

author: Leif Johansson <leifj@sunet.se> 2014-09-03 12:09:36 +0200
committer: Leif Johansson <leifj@sunet.se> 2014-09-03 12:09:36 +0200
commit: 9c0f5376b778140a8f641c0a8af946d627731a5d (patch)
tree: 2de7d81794ad5f5be23bf04cab297c89a5c63c97 /swamid-interfederations-2.0
parent: 396d5662d60715f3588faff456aa16420379bf8f (diff)
135 files changed, 2973 insertions, 1893 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 0d2bbd12..531d52a7 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,161 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-09-07T09:17:01Z" cacheDuration="PT345600S">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
-      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<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="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
+<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">kuleuven.be</shibmd:Scope>
+<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
+<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+<mdui:UIInfo>
+<mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
+<mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
+<mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
+<mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
+<mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
+<mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
+<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
+<mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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</mdui:Logo>
+</mdui:UIInfo>
+<mdui:DiscoHints>
+<mdui:DomainHint>kuleuven.be</mdui:DomainHint>
+<mdui:IPHint>134.58.0.0/16</mdui:IPHint>
+<mdui:IPHint>193.190.168.0/23</mdui:IPHint>
+<mdui:IPHint>193.190.176.0/22</mdui:IPHint>
+<mdui:IPHint>193.190.180.0/23</mdui:IPHint>
+<mdui:IPHint>193.190.253.0/24</mdui:IPHint>
+<mdui:IPHint>193.190.146.160/27</mdui:IPHint>
+<mdui:IPHint>193.190.57.0/26</mdui:IPHint>
+<mdui:IPHint>193.190.57.192/27</mdui:IPHint>
+<mdui:IPHint>193.190.57.224/27</mdui:IPHint>
+<mdui:IPHint>193.190.58.0/26</mdui:IPHint>
+<mdui:IPHint>193.190.59.0/24</mdui:IPHint>
+<mdui:IPHint>193.190.255.0/25</mdui:IPHint>
+<mdui:IPHint>193.190.138.0/24</mdui:IPHint>
+<mdui:IPHint>193.191.187.0/25</mdui:IPHint>
+<mdui:IPHint>193.190.77.0/26</mdui:IPHint>
+<mdui:IPHint>193.190.224.0/24</mdui:IPHint>
+<mdui:IPHint>193.190.225.0/24</mdui:IPHint>
+<mdui:IPHint>193.190.130.128/26</mdui:IPHint>
+<mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
+<mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
+<mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
+</mdui:DiscoHints>
+</Extensions>
+<KeyDescriptor>
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</KeyDescriptor>
+<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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.kuleuven.be/idp/profile/Shibboleth/SSO"/>
+<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
+<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.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">kuleuven.be</shibmd:Scope>
+<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
+<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+</Extensions>
+<KeyDescriptor>
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</KeyDescriptor>
+<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.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="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
+<OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
+<OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
+</Organization>
+<ContactPerson contactType="technical">
+<GivenName>AAI team</GivenName>
+<EmailAddress>shib@kuleuven.be</EmailAddress>
+</ContactPerson>
+<ContactPerson contactType="support">
+<GivenName>ICTS Servicepunt</GivenName>
+<EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
+</ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index c961d8ce..e87d835a 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-07-15T07:31:51Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-20T13:37:28Z">
       <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/aai-logon.wsl.ch.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
index feb0ec5e..b0d2c592 100644
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.wsl.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.wsl.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-10T12:27:39Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
       <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/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
index 7120498b..f1a01701 100644
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</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">
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
index 85259e17..1fa73d1f 100644
--- a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
@@ -2,12 +2,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://appdb-dev.marie.hellasgrid.gr/edugain-sp">
   <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/appdb.egi.eu.xml b/swamid-interfederations-2.0/appdb.egi.eu.xml
index 299074d5..bf416b49 100644
--- a/swamid-interfederations-2.0/appdb.egi.eu.xml
+++ b/swamid-interfederations-2.0/appdb.egi.eu.xml
@@ -2,12 +2,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://appdb.egi.eu/edugain-sp">
   <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/araripe.uece.br.xml b/swamid-interfederations-2.0/araripe.uece.br.xml
new file mode 100644
index 00000000..64c471ad
--- /dev/null
+++ b/swamid-interfederations-2.0/araripe.uece.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://araripe.uece.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">uece.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uece.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uece.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
+bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
+bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
+Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
+WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
+ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
+bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
+A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
+SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
+o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
+b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
+3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
+PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
+Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
+K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
+jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
+JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
+Z1AZ/tU3s4++vwyfNIfQkg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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://araripe.uece.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://araripe.uece.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://araripe.uece.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://araripe.uece.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">uece.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
+bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
+bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
+Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
+WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
+ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
+bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
+A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
+SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
+o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
+b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
+3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
+PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
+Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
+K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
+jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
+JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
+Z1AZ/tU3s4++vwyfNIfQkg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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">UECE - Universidade Estadiual do Ceara</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uece.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uece.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>DI Infra</SurName>
+    <EmailAddress>di.infra@uece.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
index f8be1479..1ff79ed9 100644
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
@@ -1,19 +1,31 @@
 <?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="2014-08-06T14:16:35Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-22T14:42:24Z">
       <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="de">AAI Attributes Viewer</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">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:Description xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</mdui:Description>
+        <mdui:Description xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</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:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -50,10 +62,14 @@ UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="5"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Attributes Viewer</ServiceName>
+      <ServiceName xml:lang="de">AAI Attributes Viewer</ServiceName>
       <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
+      <ServiceName xml:lang="fr">AAI Attributes Viewer</ServiceName>
+      <ServiceName xml:lang="it">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>
+      <ServiceDescription xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</ServiceDescription>
+      <ServiceDescription xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</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"/>
diff --git a/swamid-interfederations-2.0/auth.services.bmj.com.xml b/swamid-interfederations-2.0/auth.services.bmj.com.xml
index ea781fce..c2071777 100644
--- a/swamid-interfederations-2.0/auth.services.bmj.com.xml
+++ b/swamid-interfederations-2.0/auth.services.bmj.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://auth.services.bmj.com/auth">
-  <!--
-		This is an OpenAthens SP for for BMJ Publishing Group Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-05T11:42:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
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/cafe.ifro.edu.br.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
index d7cdbe74..615bce45 100644
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">IFRO</mdui:DisplayName>
         <mdui:Description xml:lang="en">IFRO</mdui:Description>
         <mdui:Description xml:lang="pt-br">IFRO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifro.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifro.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -90,8 +90,8 @@ zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
     <OrganizationName xml:lang="pt-br">IFRO</OrganizationName>
     <OrganizationDisplayName xml:lang="en">IFRO</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">IFRO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifro.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifro.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ifro.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Joilson Dantas</SurName>
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
index 6b9aaafb..b2ed9c51 100644
--- a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
@@ -23,27 +23,21 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    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
+    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
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,27 +60,23 @@ EFCt/Ng1JXuvzvJCeUaa/EFxI9OD5gNmfjXz295txCI=
         <ds:X509Data>
           <ds:X509Certificate>
       
-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
+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
+
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.ufba.br.xml b/swamid-interfederations-2.0/cafe.ufba.br.xml
new file mode 100644
index 00000000..244a589f
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufba.br.xml
@@ -0,0 +1,108 @@
+<?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.ufba.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">br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufba.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufba.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
+BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
+A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
+N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
+ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
+BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
+5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
+ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
+3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
+bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
+1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
+TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
+U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
+cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
+cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
+yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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.ufba.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufba.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufba.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufba.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>
+      
+MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
+BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
+A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
+N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
+ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
+BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
+5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
+ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
+3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
+bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
+1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
+TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
+U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
+cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
+cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
+yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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">UFBA - Universidade Federal da Bahia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufba.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufba.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Luiz Claudio Mendonca</SurName>
+    <EmailAddress>mendonca@ufba.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufop.br.xml b/swamid-interfederations-2.0/cafe.ufop.br.xml
index 780884fa..2aed2eb4 100644
--- a/swamid-interfederations-2.0/cafe.ufop.br.xml
+++ b/swamid-interfederations-2.0/cafe.ufop.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
         <mdui:Description xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
         <mdui:Description xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ufop.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ufop.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ufop.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufop.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -102,8 +102,8 @@ vL4JpRO/Msu6Zw==
     <OrganizationName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationName>
     <OrganizationDisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ufop.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ufop.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ufop.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufop.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Daniel Magalhaes Bicalho</SurName>
diff --git a/swamid-interfederations-2.0/cern.ch.xml b/swamid-interfederations-2.0/cern.ch.xml
index 41714b1f..6a4da73f 100644
--- a/swamid-interfederations-2.0/cern.ch.xml
+++ b/swamid-interfederations-2.0/cern.ch.xml
@@ -5,7 +5,7 @@
       <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://cern.ch/serviceportal" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+  <SPSSODescriptor errorURL="http://cern.ch/serviceportal" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">CERN Service Provider Proxy</mdui:DisplayName>
@@ -174,11 +174,11 @@ jdU9lus1
   <ContactPerson contactType="support">
     <GivenName>CERN</GivenName>
     <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:servicedesk@cern.ch</EmailAddress>
+    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>CERN</GivenName>
     <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:servicedesk@cern.ch</EmailAddress>
+    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
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/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/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
index 2629ce99..9a7b4c9c 100644
--- a/swamid-interfederations-2.0/doit.swisdom.org.xml
+++ b/swamid-interfederations-2.0/doit.swisdom.org.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doit.swisdom.org/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-24T10:09:34Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-25T12:32:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -22,34 +22,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFGjCCBAKgAwIBAgIUH6a66qr+t+IWYDox5Q4z6Z/jwRIwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTExMDgyMjA5Mjc0MVoXDTE0MDgyMjA5Mjc0MVow
-azELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJp
-Y2gxHTAbBgNVBAoTFFVuaXZlcnNpdGFldCBadWVyaWNoMRkwFwYDVQQDExBkb2l0
-LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l3V
-hk4B1KbWNgNTpZ+cpM46T60jD2djhERx1mjhUIPVCSoSWBFnDcuaWVHw3hiiHRQ3
-Ak1SuXPGqT+oE4ATggPvgQmeD1BVv69dIwRf8k8ykJNlHYmaNFOjTAPmfPCUUZMB
-+U0WY5+L//HVrgEzESDJgNzLV/qipXtpj9ysXTLJqJ3kwiZ+bT7KyxVXP4YEocgl
-NDVib5r6IdsvUw9Bm5ot08ZbGjKsO+uD592LV3pNib71Q6sSYcoX/a2seCnvSLBk
-v/pQple2/uSY+U+eWfRcvyOSdaByYsTNGW54XEbG2CPph7WJyyhjKJkIelnXM/NR
-bjj3oIV93uF27WXgtwIDAQABo4IBtDCCAbAwdAYIKwYBBQUHAQEEaDBmMCoGCCsG
-AQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUH
-MAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0
-MDkGA1UdEQQyMDCCEGRvaXQuc3dpc2RvbS5vcmeBHHZhaGlkLmRqYW1laUBhY2Nl
-c3MudW5pemguY2gwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEF
-BQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAO
-BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8G
-A1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyG
-Kmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNV
-HQ4EFgQUUFbI+ZNiU0fJ5tEkSatBhp6bJMAwDQYJKoZIhvcNAQEFBQADggEBAFgw
-pn5FmKkSXJS6UG3iYc5P6kDot0Ge5KB3o+Te4BaxG8IpLn/NRR1AU0WPgm/hqPA0
-RhRvxLEVLEU4zhShGURP2oTiaBkT3ArudACCw1yHFrY9+lQyMqlZeS0sgtS3RMRB
-PZFK09Z58q6U3oYHwjdjbDZgwz7e9vOYtN7uq7Yq1i1KMXiyUcGxH0xMXNXTpkl5
-7OfkKu3EolCAS7PA9pfU7rqeUC220Yaep7wZzml1kRa7Lcd61K3RHzXzY1ZynJSV
-oVuVfr2B07T4UxQr8qSyAc7CQ6OQII8R2ICM3efjlrDBI3kcvUAoxP2s2ynIERbc
-MwW3NDMLS+8yP8MK9rI=
+MIIDHDCCAgSgAwIBAgIJAJHcXT05fMs7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGRvaXQuc3dpc2RvbS5vcmcwHhcNMTQwODI1MTE1ODExWhcNMTcwODI0MTE1
+ODExWjAbMRkwFwYDVQQDExBkb2l0LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA7yfqRa1uZXzzBaC10gq40/I7xws9oK3wsbwFTlho
+4LQ1W3Ph48PlJGH0VIUEhCZE+ZEKY4QBB3a+ZZU7TWdiu0L2RZDm+pM60pfLaMZv
+sWEC5QwQQyJ27GuECU+mmXYfo7yXTdNu7JA797H7xpWdzLz37cBX6BlF5OvlkHQ2
+ViFO/xNLrw4JiBlRJkX0A+DETgutcyK6RwzQ0jstj1e/U8w9HMxYkuhJ79jcUJQx
+9F5rzfhXg9qHD0VtA9iiwlgbAdqChfyUXxQrOptaE0G3t/fuI2rwYJ3QoX7xQnwF
+arngEtm1LyfpeXWuI5IlzYrjVDs3Ba4TTYLUMuNDDFG/jQIDAQABo2MwYTBABgNV
+HREEOTA3ghBkb2l0LnN3aXNkb20ub3JnhiNodHRwczovL2RvaXQuc3dpc2RvbS5v
+cmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwAvg3JPnWCqyc595uuwFXNv2QScwDQYJ
+KoZIhvcNAQEFBQADggEBANPmBQZ+uWR42Q7Q32iCHn40YYGK0iLyyVsGYqVFjklF
+JQcQ5QiATQiLBMiXzGB8NO1LEVIEPuMQ/c0kQhBICPc+CUJkHpvIQziHwcM/GVNb
+3A60JjpG4L1hNJs+Upc6xUSYi3bteUsXE67c1pGdF5DB7IAWJjGyeM5q4BG6AmSv
+aAGKF8PQrkdLm2KLzgZIBCf+O/yVz6Yn1Jqb1JW6+TRLkWFF7eaYYAGH5YMQ8mwk
+Pu/Y3XLZI21tZN3bVaj/FW0nvSakrF6Ic+90NF+5i891xXjypJOthoe20x1ulX78
+nAvioAXLKLyPxl70a9Yj0TSJVsCSAk2bTcgY6WOnsBQ=
 						</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 81a6c4ea..ddb75036 100644
--- a/swamid-interfederations-2.0/educonf-directory.geant.net.xml
+++ b/swamid-interfederations-2.0/educonf-directory.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://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
-  <!--
-		This is a "GÉANT" simpleSAMLphp SP for the 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-28T13:11:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie.xml b/swamid-interfederations-2.0/edugate.heanet.ie.xml
index 7295e547..2698019e 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie.xml
@@ -8,10 +8,10 @@
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
       <mdui:UIInfo>
-        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
         <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
 The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
+        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie.xml b/swamid-interfederations-2.0/edugate.itb.ie.xml
index b2707518..589213e8 100644
--- a/swamid-interfederations-2.0/edugate.itb.ie.xml
+++ b/swamid-interfederations-2.0/edugate.itb.ie.xml
@@ -7,8 +7,8 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">itb.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
+        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl.xml b/swamid-interfederations-2.0/engine.surfconext.nl.xml
index 6c6bce90..6c92123c 100644
--- a/swamid-interfederations-2.0/engine.surfconext.nl.xml
+++ b/swamid-interfederations-2.0/engine.surfconext.nl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.surfconext.nl/authentication/sp/metadata">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+    <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>
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
index bd475f3e..24b4760f 100644
--- a/swamid-interfederations-2.0/filesender.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
@@ -8,7 +8,6 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">filesender.cesnet.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
@@ -36,10 +35,29 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml
new file mode 100644
index 00000000..9e0684cb
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.du1.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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">FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.du1.cesnet.cz"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky - administrator</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 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/fod.geant.net.xml b/swamid-interfederations-2.0/fod.geant.net.xml
index 67abef6c..e24e6552 100644
--- a/swamid-interfederations-2.0/fod.geant.net.xml
+++ b/swamid-interfederations-2.0/fod.geant.net.xml
@@ -2,12 +2,8 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
   <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
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/ghgtool.grnet.gr.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
index d115131c..7c660dbf 100644
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
+++ b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ghgtool.grnet.gr/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</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">
@@ -20,8 +16,8 @@
         <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
         <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.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="http://ghgtool.grnet.gr/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="http://ghgtool.grnet.gr/Shibboleth.sso/Login" 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://ghgtool.grnet.gr/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://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -94,7 +90,7 @@
       <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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="shacHomeOrganization" 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="shacHomeOrganization" Name="urn:mace:terena.org:schac:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
     </AttributeConsumingService>
diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
index 6db4290b..22782bce 100644
--- a/swamid-interfederations-2.0/gidp.geant.net.xml
+++ b/swamid-interfederations-2.0/gidp.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://gidp.geant.net">
-  <!--
-		This is a "GEANT Identity Provider" simpleSAMLphp 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-05-14T11:50:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
index 742b8523..7f47d056 100644
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
@@ -2,12 +2,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:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
diff --git a/swamid-interfederations-2.0/gw-astronomy.org.xml b/swamid-interfederations-2.0/gw-astronomy.org.xml
index 3a8bae79..4b36f849 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org.xml
@@ -1,26 +1,24 @@
 <?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">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
+  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes>
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <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/wiki/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:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -52,35 +50,35 @@ xWUYS9G3JfMMW9UY
         </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:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <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="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="givenName" Name="urn:oid:2.5.4.42" 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"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" 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"/>
+      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <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"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <Organization>
     <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
     <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
   </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Scott Koranda</GivenName>
-    <EmailAddress>skoranda@uwm.edu</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Warren Anderson</GivenName>
+    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  <ContactPerson contactType="administrative">
     <GivenName>Chris Spadanuda</GivenName>
     <EmailAddress>cspada@uwm.edu</EmailAddress>
   </ContactPerson>
-</md:EntityDescriptor>
+  <ContactPerson contactType="technical">
+    <GivenName>Branson Stephens</GivenName>
+    <EmailAddress>branson.stephens@ligo.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>UWM CGCA Help</GivenName>
+    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se.xml
index 3269a664..95642b0f 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se.xml
@@ -17,6 +17,8 @@
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
         <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
         <mdui:Logo height="90" width="350" xml:lang="sv">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hb.se</mdui:DomainHint>
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/identity.mdh.se.xml b/swamid-interfederations-2.0/identity.mdh.se.xml
index 88e51c09..85b949d5 100644
--- a/swamid-interfederations-2.0/identity.mdh.se.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se.xml
@@ -14,6 +14,8 @@
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
         <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>mdh.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br.xml b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
index 5eea4cbb..b5b2c5ca 100644
--- a/swamid-interfederations-2.0/idp-cafe.unir.br.xml
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
@@ -23,29 +23,29 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
-DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
-EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
-YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
-VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
-EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
-GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
-ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
-ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
-Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
-fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
-P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
-XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
-PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
-m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
-HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
-1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
-V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
-m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
-YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
-9y9IHg==
+    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
+IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
+SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
+VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
+bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
+BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
+BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
+IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
+Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
+jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
+/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
+o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
+sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
+7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
+DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
+WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
+3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
+/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
+S/VP03ihbZgT9/Pt
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,30 +68,29 @@ YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
-DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
-EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
-YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
-VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
-EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
-GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
-ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
-ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
-Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
-fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
-P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
-XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
-PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
-m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
-HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
-1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
-V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
-m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
-YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
-9y9IHg==
-
+MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
+IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
+SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
+VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
+bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
+BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
+BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
+IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
+Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
+jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
+/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
+o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
+sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
+7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
+DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
+WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
+3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
+/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
+S/VP03ihbZgT9/Pt
                   
             </ds:X509Certificate>
         </ds:X509Data>
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 7d61df0b..ca2a8313 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 82e1bfcf..9fe2bbc2 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-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.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
index 2cc4a79a..4415c02e 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-07-10T13:07:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-https://aai.arnes.si/static/doc/ArnesAAI_general.pdf
-</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="sl">
-https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf
-</mdrpi:RegistrationPolicy>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-08-25T15:08:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
@@ -165,52 +161,29 @@ https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf
         <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
         <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
-        <mdui:Keywords xml:lang="en">arnes idp identity</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">arnes idp identityd</mdui:Keywords>
         <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
-        <mdui:Logo height="135" width="150">
-data:image/png;base64,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
-</mdui:Logo>
+        <mdui:Logo height="135" width="150">data:image/png;base64,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</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.arnes.si</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sl">http://www.arnes.si</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">
-http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html
-</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sl">
-http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html
-</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</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>
-MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <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:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
@@ -218,8 +191,8 @@ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
     <md:OrganizationName xml:lang="sl">Arnes</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.arnes.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.arnes.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>AAA</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index 66a2b8bf..8d1cafa3 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.gr/idp/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
index e6eb3e89..9dd5228c 100644
--- a/swamid-interfederations-2.0/idp.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.bth.se.xml
@@ -15,6 +15,8 @@
         <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>bth.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca.xml b/swamid-interfederations-2.0/idp.canarie.ca.xml
index 7ea0bd11..9d3bb4f8 100644
--- a/swamid-interfederations-2.0/idp.canarie.ca.xml
+++ b/swamid-interfederations-2.0/idp.canarie.ca.xml
@@ -15,7 +15,7 @@ http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
         <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
         <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
         <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
index 48246c67..036deba8 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>
@@ -51,39 +48,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
-						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
-						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
-						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
-						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
-						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
-						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
-						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
-						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
-						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
-						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
-						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
-						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
-						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
-						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
@@ -127,39 +91,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
-						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
-						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
-						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
-						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
-						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
-						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
-						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
-						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
-						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
-						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
-						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
-						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
-						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
-						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
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.craw.eu.xml b/swamid-interfederations-2.0/idp.craw.eu.xml
new file mode 100644
index 00000000..36a75454
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.craw.eu.xml
@@ -0,0 +1,85 @@
+<?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.craw.eu/idp/shibboleth">
+  <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">craw.eu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
+MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+                	</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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.craw.eu/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/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">craw.eu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
+MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+			</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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">CRA-W</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CRA-W</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cra.wallonie.be</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Christopher</GivenName>
+    <SurName>PAUL</SurName>
+    <EmailAddress>maintenance@cra.wallonie.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index b2285811..c26902b0 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,10 +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: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: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>
@@ -16,17 +21,13 @@
         <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.dit.ie.xml b/swamid-interfederations-2.0/idp.dit.ie.xml
index c4e824ea..561649c5 100644
--- a/swamid-interfederations-2.0/idp.dit.ie.xml
+++ b/swamid-interfederations-2.0/idp.dit.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">dit.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie.xml b/swamid-interfederations-2.0/idp.dkit.ie.xml
index b5008e43..89545f05 100644
--- a/swamid-interfederations-2.0/idp.dkit.ie.xml
+++ b/swamid-interfederations-2.0/idp.dkit.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">dkit.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
+        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
index 768a0e01..eae2d04f 100644
--- a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ebi.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.ebi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth EMBL-EBI IdP for the European Molecular Biology Laboratory.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
       <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 f18288de..bdc96611 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,369 +1,378 @@
 <?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">asker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bardu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">eidsvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.harstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ski.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">folkeuniversitetet.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">gjerdrum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hammerfest.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">hurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">kvanangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">lyngen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">midsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-ak.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">nordkapp.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">ringsaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">sandnes.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">skanland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spydeberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">storfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">time.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">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">asker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">gjerdrum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">kvanangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">lyngen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">midsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">nordkapp.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">ringsaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">sandnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">skanland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sortland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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>
@@ -373,10 +382,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>
@@ -384,8 +393,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.heanet.ie.xml b/swamid-interfederations-2.0/idp.heanet.ie.xml
index 6a8072e8..1c751a7f 100644
--- a/swamid-interfederations-2.0/idp.heanet.ie.xml
+++ b/swamid-interfederations-2.0/idp.heanet.ie.xml
@@ -7,8 +7,8 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">heanet.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">HEAnet Limited.</mdui:DisplayName>
+        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
@@ -40,7 +40,6 @@ rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/logout.jsp"/>
     <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-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
index de865cea..39d32d74 100644
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ b/swamid-interfederations-2.0/idp.hig.se.xml
@@ -16,6 +16,8 @@
         <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
         <mdui:Logo height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
         <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hig.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
index f3aaac66..c6b9f819 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch.xml
+++ b/swamid-interfederations-2.0/idp.hslu.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://idp.hslu.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-13T06:45:05Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-18T09:06:25Z">
       <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/idp.inpa.gov.br.xml b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
index 15ce2401..392875d6 100644
--- a/swamid-interfederations-2.0/idp.inpa.gov.br.xml
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
@@ -23,25 +23,21 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
-BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
-MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
-DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
-MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
-cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
-em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
-5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
-bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
-7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
-OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
-fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
-oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
-QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
-BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
-fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
-ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
+NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
+963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
+9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
+ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
+mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
+4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
+bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
+kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
+K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
+Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
+8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
+g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,26 +60,21 @@ ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
-BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
-MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
-DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
-MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
-cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
-em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
-5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
-bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
-7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
-OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
-fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
-oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
-QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
-BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
-fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
-ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
-
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
+NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
+963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
+9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
+ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
+mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
+4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
+bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
+kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
+K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
+Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
+8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
+g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.ipa.ie.xml b/swamid-interfederations-2.0/idp.ipa.ie.xml
index d0761cd4..c1bb8b31 100644
--- a/swamid-interfederations-2.0/idp.ipa.ie.xml
+++ b/swamid-interfederations-2.0/idp.ipa.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">ipa.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
+        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie.xml b/swamid-interfederations-2.0/idp.itsligo.ie.xml
index df9b6205..6eba3b00 100644
--- a/swamid-interfederations-2.0/idp.itsligo.ie.xml
+++ b/swamid-interfederations-2.0/idp.itsligo.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">itsligo.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
+        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie.xml b/swamid-interfederations-2.0/idp.ittralee.ie.xml
index 0bf0f4fa..84c00eb0 100644
--- a/swamid-interfederations-2.0/idp.ittralee.ie.xml
+++ b/swamid-interfederations-2.0/idp.ittralee.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">ittralee.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
+        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.kb.se.xml b/swamid-interfederations-2.0/idp.kb.se.xml
index 88ffe07a..6bb74f83 100644
--- a/swamid-interfederations-2.0/idp.kb.se.xml
+++ b/swamid-interfederations-2.0/idp.kb.se.xml
@@ -14,6 +14,8 @@
         <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for National Library of Sweden.</mdui:Description>
         <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kb.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
index 80da0cfe..5dfc6f63 100644
--- a/swamid-interfederations-2.0/idp.lrz.de.xml
+++ b/swamid-interfederations-2.0/idp.lrz.de.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
         <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
         <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
-        <mdui:Logo height="108" width="100">https://idp.lrz.de/idp/images/lrzlogo.jpg</mdui:Logo>
+        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
       </mdui:UIInfo>
@@ -103,6 +103,7 @@ t0kVopfGsEIT142DrBwPmGvPGmU=
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
@@ -195,13 +196,14 @@ t0kVopfGsEIT142DrBwPmGvPGmU=
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="de">e38</OrganizationName>
     <OrganizationName xml:lang="en">e38</OrganizationName>
     <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.lrz-muenchen.de</OrganizationURL>
+    <OrganizationURL xml:lang="de">http://www.lrz.de</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-interfederations-2.0/idp.ncirl.ie.xml b/swamid-interfederations-2.0/idp.ncirl.ie.xml
index 6322dd26..b834eeac 100644
--- a/swamid-interfederations-2.0/idp.ncirl.ie.xml
+++ b/swamid-interfederations-2.0/idp.ncirl.ie.xml
@@ -3,14 +3,14 @@
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z"/>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">ncirl.ie</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
         <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.ncirl.ie/Legal/Privacy.aspx</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
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.nuigalway.ie.xml b/swamid-interfederations-2.0/idp.nuigalway.ie.xml
index 1f4e8ab1..05376305 100644
--- a/swamid-interfederations-2.0/idp.nuigalway.ie.xml
+++ b/swamid-interfederations-2.0/idp.nuigalway.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">nuigalway.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
+        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr.xml
index c02b1e5c..978cf7f0 100644
--- a/swamid-interfederations-2.0/idp.renater.fr.xml
+++ b/swamid-interfederations-2.0/idp.renater.fr.xml
@@ -49,6 +49,6 @@ JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
     <OrganizationURL xml:lang="en">www.renater.fr</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <EmailAddress>support-federation@support.renater.fr</EmailAddress>
+    <EmailAddress>support@support.renater.fr</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.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
index e165e000..54eb8c63 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se.xml
@@ -15,6 +15,8 @@
         <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>bth.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.ul.ie.xml b/swamid-interfederations-2.0/idp.ul.ie.xml
index 5cb9df8c..9f04c0ad 100644
--- a/swamid-interfederations-2.0/idp.ul.ie.xml
+++ b/swamid-interfederations-2.0/idp.ul.ie.xml
@@ -7,9 +7,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">ul.ie</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
+        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
new file mode 100644
index 00000000..03a7ff14
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
@@ -0,0 +1,105 @@
+<?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:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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 regexp="false">unibocconi.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
+                            BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
+                            NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+                            if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+                            jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+                            dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+                            iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+                            ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+                            AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+                            L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+                            l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+                            7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+                            BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+                            uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+                            9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+                            uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+                            K93oKA==  
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.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 regexp="false">unibocconi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
+                            BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
+                            NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+                            if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+                            jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+                            dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+                            iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+                            ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+                            AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+                            L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+                            l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+                            7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+                            BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+                            uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+                            9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+                            uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+                            K93oKA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bocconi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idem@unibocconi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr.xml b/swamid-interfederations-2.0/idp.uoa.gr.xml
index 0fd0d129..29e2e26e 100644
--- a/swamid-interfederations-2.0/idp.uoa.gr.xml
+++ b/swamid-interfederations-2.0/idp.uoa.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uoa.gr/idp/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
diff --git a/swamid-interfederations-2.0/idp.urca.br.xml b/swamid-interfederations-2.0/idp.urca.br.xml
new file mode 100644
index 00000000..7f41e3ec
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.urca.br.xml
@@ -0,0 +1,102 @@
+<?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.urca.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">urca.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">URCA - Universidade Regional do Cariri </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:DisplayName>
+        <mdui:Description xml:lang="en">URCA - Universidade Regional do Cariri </mdui:Description>
+        <mdui:Description xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.urca.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.urca.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
+A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
+NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
+Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
+L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
+jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
+yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
+7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
+qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
+OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
+oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
+DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
+nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
+xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.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">urca.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
+A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
+NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
+Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
+L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
+jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
+yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
+7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
+qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
+OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
+oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
+DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
+nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
+xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.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">URCA - Universidade Regional do Cariri</OrganizationName>
+    <OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.urca.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.urca.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Herbert Novais</SurName>
+    <EmailAddress>herbert.novais@urca.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be.xml b/swamid-interfederations-2.0/idp1.hogent.be.xml
new file mode 100644
index 00000000..04bc41b6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.hogent.be.xml
@@ -0,0 +1,96 @@
+<?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://idp1.hogent.be/idp/shibboleth">
+  <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">hogent.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
+DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.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://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.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">hogent.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
+DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.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">
+    Hogeschool Gent
+    </OrganizationName>
+    <OrganizationDisplayName xml:lang="en">
+    Hogeschool Gent
+    </OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">
+    http://www.hogent.be
+    </OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>helpdesk@hogent.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se.xml b/swamid-interfederations-2.0/idp2-1.slu.se.xml
index 983b259c..3173d1dc 100644
--- a/swamid-interfederations-2.0/idp2-1.slu.se.xml
+++ b/swamid-interfederations-2.0/idp2-1.slu.se.xml
@@ -17,6 +17,8 @@
         <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
         <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>slu.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
index b2c2eb06..4e6a0620 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/idp2.ics.muni.cz.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
index 86a2df90..37f790f8 100644
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
+++ b/swamid-interfederations-2.0/idp2.ics.muni.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/group/mefanet</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/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se.xml
index 69f4a142..a578507e 100644
--- a/swamid-interfederations-2.0/idp2.kau.se.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se.xml
@@ -20,6 +20,8 @@
         <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kau.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/instantanatomy.co.uk.xml b/swamid-interfederations-2.0/instantanatomy.co.uk.xml
index afb9bf35..05448016 100644
--- a/swamid-interfederations-2.0/instantanatomy.co.uk.xml
+++ b/swamid-interfederations-2.0/instantanatomy.co.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://instantanatomy.co.uk/shib">
-  <!--
-		This is a Shibboleth SP for Andrew Whitaker trading as Instant Anatomy.
-	-->
   <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/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/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se.xml
index 68072b14..26e764d6 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se.xml
@@ -14,6 +14,8 @@
         <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
         <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>ki.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
index e1fa1bed..c3fbc254 100644
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.xml
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
@@ -66,6 +66,7 @@ OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -118,6 +119,7 @@ OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="de">e29</OrganizationName>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
index a88495cf..a8173518 100644
--- a/swamid-interfederations-2.0/login-idp.auth.gr.xml
+++ b/swamid-interfederations-2.0/login-idp.auth.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-idp.auth.gr/idp/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
index 149e3079..05545b55 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
index 0445d7d8..35a2ac7c 100644
--- a/swamid-interfederations-2.0/login.du.se.xml
+++ b/swamid-interfederations-2.0/login.du.se.xml
@@ -16,6 +16,8 @@
         <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
         <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
         <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>du.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz.xml b/swamid-interfederations-2.0/login.feld.cvut.cz.xml
index 4dd73b37..6606d778 100644
--- a/swamid-interfederations-2.0/login.feld.cvut.cz.xml
+++ b/swamid-interfederations-2.0/login.feld.cvut.cz.xml
@@ -1,28 +1,28 @@
 <?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://login.feld.cvut.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.feld.cvut.cz/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </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>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
         <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://login.feld.cvut.cz/img/logo_cvut_40pix.png</mdui:Logo>
+        <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.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>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -51,26 +51,26 @@ r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
 qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
 UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
 yrp1Je1EyA==
-            </ds:X509Certificate>
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</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.feld.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.feld.cvut.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>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz: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: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://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -99,33 +99,33 @@ r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
 qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
 UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
 yrp1Je1EyA==
-            </ds:X509Certificate>
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</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">CTU FEE</OrganizationName>
-    <OrganizationName xml:lang="cs">ČVUT FEL</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jíří</GivenName>
-    <SurName>Cejp</SurName>
-    <EmailAddress>cejp@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/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="cs">ČVUT FEL</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Novakov</md:SurName>
+    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jíří</md:GivenName>
+    <md:SurName>Cejp</md:SurName>
+    <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
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.liu.se.xml b/swamid-interfederations-2.0/login.liu.se.xml
index 84272ba6..4ce953b8 100644
--- a/swamid-interfederations-2.0/login.liu.se.xml
+++ b/swamid-interfederations-2.0/login.liu.se.xml
@@ -23,6 +23,8 @@
         <mdui:Logo height="53" width="80" xml:lang="en">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
         <mdui:Logo height="50" width="50" xml:lang="en">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
         <mdui:Logo height="16" width="16" xml:lang="en">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>liu.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
index 5b176203..e55f4396 100644
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -2,12 +2,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.gr/idp/shibboleth">
   <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="el">
-                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
-                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.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">
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/pan.unifei.edu.br.xml b/swamid-interfederations-2.0/pan.unifei.edu.br.xml
index c14e3e95..76f1cf1e 100644
--- a/swamid-interfederations-2.0/pan.unifei.edu.br.xml
+++ b/swamid-interfederations-2.0/pan.unifei.edu.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
         <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
         <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.unifei.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.unifei.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -104,8 +104,8 @@ xy0=
     <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
     <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.unifei.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.unifei.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unifei.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Everaldo Campos</SurName>
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/portal.moonshot.ja.net.xml b/swamid-interfederations-2.0/portal.moonshot.ja.net.xml
index 7657599e..0cf8837a 100644
--- a/swamid-interfederations-2.0/portal.moonshot.ja.net.xml
+++ b/swamid-interfederations-2.0/portal.moonshot.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://portal.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot Portal" 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/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/rems.elixir-finland.org.xml b/swamid-interfederations-2.0/rems.elixir-finland.org.xml
index 3e875160..d3bdd0b3 100644
--- a/swamid-interfederations-2.0/rems.elixir-finland.org.xml
+++ b/swamid-interfederations-2.0/rems.elixir-finland.org.xml
@@ -15,8 +15,8 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
         <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
+        <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
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/saml-1.sys.kth.se.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
index be159ba6..db7932d1 100644
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
+++ b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
@@ -16,6 +16,8 @@
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
         <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kth.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
index 25a7bb0f..dec53fee 100644
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.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://saml.ps-ui-test.qalab.geant.net">
-  <!--
-		This is a perfSONAR UI 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-07-01T15:25:50Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
index ff66577c..f4ba77d0 100644
--- a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
+++ b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
         <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
         <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifbaiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifbaiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ifbaiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -103,8 +103,8 @@ zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
     <OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationName>
     <OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifbaiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifbaiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Humberto Santiago</SurName>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
index c5dbbd20..712fa1d6 100644
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
+++ b/swamid-interfederations-2.0/sdauth.sciencedirect.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://sdauth.sciencedirect.com/">
-  <!--
-		This is a "ScienceDirect" Shibboleth SP for Elsevier B.V.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-08T16:50:51Z"/>
   </Extensions>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
index add66844..38ec5524 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
@@ -14,6 +14,8 @@
         <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
         <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
         <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>oru.se</mdui:DomainHint>
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.ifgoiano.edu.br.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
index b35c3fb0..d71d04d4 100644
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
         <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
         <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifgoiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifgoiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ifgoiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -106,8 +106,8 @@ t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
     <OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationName>
     <OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifgoiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifgoiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Frederico Pereira da Cunha</SurName>
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/shibb1.hj.se.xml b/swamid-interfederations-2.0/shibb1.hj.se.xml
index 5d087664..3dfba952 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se.xml
@@ -17,6 +17,8 @@
         <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
         <mdui:Logo height="77" width="299" xml:lang="sv">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
         <mdui:Logo height="77" width="277" xml:lang="en">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hj.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se.xml b/swamid-interfederations-2.0/shibbo.ltu.se.xml
index 1be67572..e2ee06e5 100644
--- a/swamid-interfederations-2.0/shibbo.ltu.se.xml
+++ b/swamid-interfederations-2.0/shibbo.ltu.se.xml
@@ -15,6 +15,8 @@
         <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>ltu.se</mdui:DomainHint>
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..5cfa701b 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>
@@ -59,6 +56,7 @@
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="3"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
@@ -67,6 +65,10 @@
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
@@ -75,6 +77,10 @@
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="7"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="8"/>
@@ -87,6 +93,12 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="19"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="22"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
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
index 04f4e03d..599f6f14 100644
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.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://sp.onlinelibrary.wiley.com/shibboleth">
-  <!--
-		This is a "Wiley Online Library" Shibboleth SP for John Wiley & Sons 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/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index 7b50bdbc..7275d47e 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="fi">Turun yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</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/tcs-escience-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
index 2bb210af..faa10d9b 100644
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
@@ -38,4 +38,9 @@
     <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UvT</md:GivenName>
+    <md:SurName>LIS Unix</md:SurName>
+    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
index 03b10873..b485ac9f 100644
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
@@ -1,10 +1,10 @@
 <?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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
+  </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>
@@ -38,4 +38,9 @@
     <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UvT</md:GivenName>
+    <md:SurName>LIS Unix</md:SurName>
+    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md: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/tumidp.lrz.de.xml b/swamid-interfederations-2.0/tumidp.lrz.de.xml
index 7e211e0e..b7e5b56d 100644
--- a/swamid-interfederations-2.0/tumidp.lrz.de.xml
+++ b/swamid-interfederations-2.0/tumidp.lrz.de.xml
@@ -100,6 +100,7 @@ AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
@@ -190,6 +191,7 @@ AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="de">e8</OrganizationName>
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/verify.studentbeans.com.xml b/swamid-interfederations-2.0/verify.studentbeans.com.xml
new file mode 100644
index 00000000..95dcfab3
--- /dev/null
+++ b/swamid-interfederations-2.0/verify.studentbeans.com.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.studentbeans.com/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T12:07:00Z">
+      <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://verify.studentbeans.com/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://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
+						VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
+						BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
+						YmVhbnMuY29tMSswKQYJKoZIhvcNAQkBFhxkZXZlbG9wZXJzQHRoZWJlYW5zZ3Jv
+						dXAuY29tMB4XDTE0MDQxMDE1MzcyNloXDTI0MDQwNzE1MzcyNlowgZwxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEcMBoGA1UE
+						CgwTVGhlIEJlYW5zIEdyb3VwIEx0ZDEgMB4GA1UEAwwXdmVyaWZ5LnN0dWRlbnRi
+						ZWFucy5jb20xKzApBgkqhkiG9w0BCQEWHGRldmVsb3BlcnNAdGhlYmVhbnNncm91
+						cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqGDfRStUUNFor
+						otpdWs83wj0xQQ4sP0PfIyWV7kjGNSBA4WuyqX/nxz0prwJfOKzdNKcCdM9ZR8vD
+						AzjeDJ5Y2vneAKhmGMjucEPoy5Zb9dC6fFP2M6mmM47oAFGT2rzTZKFWbAKyV0f8
+						zE6K+Ddq//dmkA5IwTWpq63c/ouEtG8IP8kGdthpQLmNvhg1C0Afko/xydvs2LXh
+						y3XZUxKEDSu3NhvIWxE4iv7TTs4vnXvQLmPd3xSWQZEbd+/golvl0hs6tsBCQR8T
+						fUjgUCatbzT177hkhhHNkhlYLaUtf6k/9mO1U1t8aIDA+wlA0Js+irTqxLi4OmgK
+						2XtMjERRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSq41Sfw3DoEWvPwtTW
+						7Z2Za78S0DAfBgNVHSMEGDAWgBSq41Sfw3DoEWvPwtTW7Z2Za78S0DANBgkqhkiG
+						9w0BAQUFAAOCAQEAfxOkl3ajUkZMYII16kS/SFEQGCQ+KGAvaBFZsVm0fkdGKLhm
+						fCM56Y9yx38PNUG90AACWSxGAjzvRbwV6AwLgOtqO9yGUQMtMgITRa6Gw35DVhWT
+						Iz6w5KFhKX0iCM+NGAQaPGnM0c5Y7zwyI/fBeO9VfAcXUwBPu1eUeoQitzv6/XXz
+						LzmtbQlpgBWPfi30tXx0ZfJALdWkP54Bbubw7nC8KlMZInpTdtot/CYqk6K1yZ5K
+						dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
+						UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">The Beans Group Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Student Beans</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.studentbeans.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Vincent</GivenName>
+    <SurName>Siebert</SurName>
+    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Seren</GivenName>
+    <SurName>Altiner</SurName>
+    <EmailAddress>mailto:seren@thebeansgroup.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Vincent</GivenName>
+    <SurName>Siebert</SurName>
+    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index c4852dcb..9c0b696d 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,5 +1,10 @@
 <?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>
@@ -184,11 +189,6 @@
       <shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -216,4 +216,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/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
index 4e5058c2..61be6344 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se.xml
@@ -25,6 +25,8 @@
         <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>uu.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
index 58c8e156..48674cd6 100644
--- a/swamid-interfederations-2.0/weblogin2.geant.net.xml
+++ b/swamid-interfederations-2.0/weblogin2.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://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>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
index 07ddffee..8c5c586d 100644
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
+++ b/swamid-interfederations-2.0/wiki.moonshot.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://wiki.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot 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/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 07391e53..9182934b 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,50 +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/shibboleth">
-  <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>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</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>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
-      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Atypon Systems Inc.</md:Company>
-    <md:GivenName>SSO-Support</md:GivenName>
-    <md:SurName>SSO-Support</md:SurName>
-    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
-    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Atypon Systems Inc.</md:Company>
-    <md:GivenName>SSO-Tech</md:GivenName>
-    <md:SurName>SSO-Tech</md:SurName>
-    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
-    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
-  </md:ContactPerson>
-</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.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.researchprofessional.com.xml b/swamid-interfederations-2.0/www.researchprofessional.com.xml
index da309ada..60671037 100644
--- a/swamid-interfederations-2.0/www.researchprofessional.com.xml
+++ b/swamid-interfederations-2.0/www.researchprofessional.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.researchprofessional.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Research Research Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-25T09:10:08Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
@@ -22,7 +19,7 @@
     <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.researchprofessional.com/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="17" width="182">https://www.researchprofessional.com/images/logo.png</mdui:Logo>
+        <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
         <mdui:Description xml:lang="en">Research Professional is an intuitive platform
 					for online access to news and funding services.</mdui:Description>
@@ -95,8 +92,8 @@
     <EmailAddress>mailto:sp@researchresearch.com</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Dominic</GivenName>
-    <SurName>Bevacqua</SurName>
-    <EmailAddress>mailto:db@researchresearch.com</EmailAddress>
+    <GivenName>Steve</GivenName>
+    <SurName>Potter</SurName>
+    <EmailAddress>mailto:sso-uk@researchresearch.com</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
index 62c6ab3a..f83d55c6 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"/>
author	Leif Johansson <leifj@sunet.se>	2014-09-03 12:09:36 +0200
committer	Leif Johansson <leifj@sunet.se>	2014-09-03 12:09:36 +0200
commit	9c0f5376b778140a8f641c0a8af946d627731a5d (patch)
tree	2de7d81794ad5f5be23bf04cab297c89a5c63c97 /swamid-interfederations-2.0
parent	396d5662d60715f3588faff456aa16420379bf8f (diff)