diff --git a/metadata/archive.mpi.nl.xml b/metadata/archive.mpi.nl.xml
index f0a5f2a..f97dab9 100644
--- a/metadata/archive.mpi.nl.xml
+++ b/metadata/archive.mpi.nl.xml
@@ -1,156 +1,268 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                     xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                     xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
-                     xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:remd="http://refeds.org/metadata"
-                     xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-                     xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-                     xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     entityID="https://archive.mpi.nl">
+<md:EntityDescriptor
+   xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+   xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+   xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+   xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+   xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+   xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+   xmlns:remd="http://refeds.org/metadata"
+   xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   entityID="https://archive.mpi.nl">
    <md:Extensions>
       <mdattr:EntityAttributes>
-         <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                         Name="http://macedir.org/entity-category">
+         <saml:Attribute
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            Name="http://macedir.org/entity-category">
             <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
          </saml:Attribute>
-         <saml:Attribute Name="http://macedir.org/entity-category"
-                         NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+         <saml:Attribute
+            Name="http://macedir.org/entity-category"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
             <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
          </saml:Attribute>
-         <saml:Attribute Name="http://macedir.org/entity-category"
-                         NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+         <saml:Attribute
+            Name="http://macedir.org/entity-category"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
             <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
          </saml:Attribute>
       </mdattr:EntityAttributes>
    </md:Extensions>
-   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+   <md:SPSSODescriptor
+      protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
       <md:Extensions>
          <mdui:UIInfo>
-            <mdui:DisplayName xml:lang="en">MPI-PL Archive</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="nl">MPI-PL Archief</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="de">MPI-PL Archiv</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="fi">MPI-PL Arkiston</mdui:DisplayName>
-            <mdui:Description xml:lang="en">Research data archive at the Max Planck Institute for Psycholinguistics</mdui:Description>
-            <mdui:Description xml:lang="nl">Archief met onderzoeksdata bij het Max Planck Instituut voor Psycholinguïstiek</mdui:Description>
-            <mdui:Description xml:lang="de">Forschungsdatenarchiv am Max-Planck-Institut für Psycholinguistik</mdui:Description>
-            <mdui:Description xml:lang="fi">Max Planckin Psykolingvistiikan Instituutin tutkimustietokannasta</mdui:Description>
-            <mdui:Keywords xml:lang="en">Max+Planck+Institute Psycholinguistics Language Research Data Services</mdui:Keywords>
-            <mdui:Keywords xml:lang="nl">Max+Planck+Instituut Psycholinguïstiek Taal Onderzoeksdata Diensten</mdui:Keywords>
-            <mdui:Keywords xml:lang="de">Max-Planck-Institut Psycholinguistik Sprache Forschungsdaten Dienstleistungen</mdui:Keywords>
-            <mdui:Keywords xml:lang="fi">Max+Planck+Instituutti Psykolingvistiikan Kieli Tutkimustiedot Palvelut</mdui:Keywords>
-            <mdui:Logo height="495" width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</mdui:Logo>
-            <mdui:Logo height="89" width="90">https://sp.mpi.nl/gif/mpg-logo-90.png</mdui:Logo>
-            <mdui:InformationURL xml:lang="en">https://archive.mpi.nl</mdui:InformationURL>
-            <mdui:PrivacyStatementURL xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</mdui:PrivacyStatementURL>
+            <mdui:DisplayName
+               xml:lang="en">MPI-PL Archive</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="nl">MPI-PL Archief</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="de">MPI-PL Archiv</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="fi">MPI-PL Arkiston</mdui:DisplayName>
+            <mdui:Description
+               xml:lang="en">Research data archive at the Max Planck Institute for
+               Psycholinguistics</mdui:Description>
+            <mdui:Description
+               xml:lang="nl">Archief met onderzoeksdata bij het Max Planck Instituut voor
+               Psycholinguïstiek</mdui:Description>
+            <mdui:Description
+               xml:lang="de">Forschungsdatenarchiv am Max-Planck-Institut für
+               Psycholinguistik</mdui:Description>
+            <mdui:Description
+               xml:lang="fi">Max Planckin Psykolingvistiikan Instituutin
+               tutkimustietokannasta</mdui:Description>
+            <mdui:Keywords
+               xml:lang="en">Max+Planck+Institute Psycholinguistics Language Research Data
+               Services</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="nl">Max+Planck+Instituut Psycholinguïstiek Taal Onderzoeksdata
+               Diensten</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="de">Max-Planck-Institut Psycholinguistik Sprache Forschungsdaten
+               Dienstleistungen</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="fi">Max+Planck+Instituutti Psykolingvistiikan Kieli Tutkimustiedot
+               Palvelut</mdui:Keywords>
+            <mdui:Logo
+               height="495"
+               width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</mdui:Logo>
+            <mdui:Logo
+               height="89"
+               width="90">https://sp.mpi.nl/gif/mpg-logo-90.png</mdui:Logo>
+            <mdui:InformationURL
+               xml:lang="en">https://archive.mpi.nl</mdui:InformationURL>
+            <mdui:PrivacyStatementURL
+               xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</mdui:PrivacyStatementURL>
          </mdui:UIInfo>
-         <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                                Location="https://archive.mpi.nl/Shibboleth.sso/Login"/>
-         <idpdisc:DiscoveryResponse index="1"
-                                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                                    Location="https://archive.mpi.nl/Shibboleth.sso/Login"/>
+         <init:RequestInitiator
+            Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+            Location="https://archive.mpi.nl/Shibboleth.sso/Login"/>
+         <idpdisc:DiscoveryResponse
+            index="1"
+            Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+            Location="https://archive.mpi.nl/Shibboleth.sso/Login"/>
       </md:Extensions>
       <md:KeyDescriptor>
          <ds:KeyInfo>
             <ds:X509Data>
-               <ds:X509Certificate>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</ds:X509Certificate>
+               <ds:X509Certificate>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</ds:X509Certificate>
             </ds:X509Data>
          </ds:KeyInfo>
       </md:KeyDescriptor>
       <md:KeyDescriptor>
          <ds:KeyInfo>
             <ds:X509Data>
-               <ds:X509Certificate>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</ds:X509Certificate>
+               <ds:X509Certificate>MIIHdjCCBV6gAwIBAgIQIjDdSbL1CR4OsjcnV9Jm9TANBgkqhkiG9w0BAQwFADBE
+                  MQswCQYDVQQGEwJOTDEZMBcGA1UEChMQR0VBTlQgVmVyZW5pZ2luZzEaMBgGA1UE
+                  AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjMwMTEwMDAwMDAwWhcNMjQwMTEwMjM1
+                  OTU5WjB7MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5ZXJuMUcwRQYDVQQKDD5N
+                  YXgtUGxhbmNrLUdlc2VsbHNjaGFmdCB6dXIgRsO2cmRlcnVuZyBkZXIgV2lzc2Vu
+                  c2NoYWZ0ZW4gZS5WLjESMBAGA1UEAxMJc3AubXBpLm5sMIIBIjANBgkqhkiG9w0B
+                  AQEFAAOCAQ8AMIIBCgKCAQEAzC4CF9XH+P3a97mwn/BOL4oA1m5R5YFPSPlqA1X2
+                  Aa9Xlo4Q7qFcr5jKU7YkmG3dslYm0OLvWAUju8TDdGC0wjbEVZQmhMYQ/0erg3B4
+                  k/3Cj48z9SRJswku15/e5RVKr/6q5wxgvkbhMCQ6yFqo9GA3vxOyL3Dn7FJ8Zfyc
+                  jVtiJ35Z7PKuWTDllZaVKXUHte1q/6poe6/IT7+nEnO+LKZKPDirAWccbKgy+1Mh
+                  U98fibWALGvgJJb7paB3rM6BoOxcTb3RZtrTSyOALIoUzEDNlCpfgL0u9xOFot8u
+                  +84UyflNbIW9AegHKHtI3ARk09n4OdGNMwyiqA0IUZEr2QIDAQABo4IDKzCCAycw
+                  HwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFFmCYNUJ
+                  7eqP4Uc76EFbsXobxPhsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+                  A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQB
+                  sjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgG
+                  BmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3Rp
+                  Z28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEF
+                  BQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0
+                  LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20w
+                  ggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB2AHb/iD8KtvuVUcJhzPWHujS0pM27
+                  KdxoQgqf5mdMWjp0AAABhZkdmMEAAAQDAEcwRQIgUa0UmgguYoo3d2X8CA9hcOj7
+                  R6X0PEKj0JErkmjiRKkCIQC/eaEbgM6zjSTK/PBTwYQ/2Ozq6E5zDHVyxoNZhr/o
+                  JgB1ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2kPTBI1/urAAABhZkdmKoAAAQD
+                  AEYwRAIgI8UvY8mTuqt950StabgHHXVkQcDNQ1nXF+nXPZeF2MMCIA4PSvWiyqtD
+                  M5Uz/Go8xGSj/M++d04HbxFpnU53/78HAHYA7s3QZNXbGs7FXLedtM0TojKHRny8
+                  7N7DUUhZRnEftZsAAAGFmR2YZwAABAMARzBFAiAsX3ZDLilWQyKZx5kEt2T3Z86i
+                  rVYWkmlh2HSkUO4QHwIhAMBJPChECKquNg2IRmqqFRw0NjOPlOwp+v5QiawNHGqI
+                  MCQGA1UdEQQdMBuCCXNwLm1waS5ubIIOYXJjaGl2ZS5tcGkubmwwDQYJKoZIhvcN
+                  AQEMBQADggIBAA2K4JeBaTDI/glTpTNt03QAB0xefw1JE8iUbHiGs39IeeqtgFfb
+                  W2ixUJJzXhgA+bTWwG7g4u3I1nba/3AAwpXeFyNyJXipk4GO1N7AS+WY9d+9DfcO
+                  WMF20rwXsSqAD2UpvSXs4b+pu+6+RJNTPyZBjtsu+G9SuC2CWgq/hd5+qCtE558+
+                  xIRZqLniYi2EhtJSh5BLt6k0pDj/bQorPjdqG6HyH3gyTaNR6hG0DNPE4hGy6vda
+                  ZvYROb1jWyP+uzE8IrGOElrEBLQ74sJUHYayCe0v1MF1pW/EvJqeq/ThWfRpJ2/h
+                  wPmo0l8TlWCx6kQ+xNLsN62eoIsbSJpNZHI3aWbUPSqEEfAF6nDjoOjPGdXOUG6C
+                  uI5y360eVBfQP3PewpBwWHoffg39QPkeYAf0ODsYmV+EMiQ+/sL6SoEcAkVzgfI0
+                  OZamXsD6yBuSzJkBJNOjZN6sPAE/cOYxt9PcgGdg0sbKbRL0jW3ZhpBvLSetm1Vg
+                  3Z29vuIyvI1v8+iVHAhV+Atf/Gv0hmevzOMLC2rqNKaDPLqk/vkY+AV7mdtyTMOP
+                  ipXvKlE/glTqyn0dov+QDWvhKwYEICrkKVsJamUlB9OnvaQwsbvQESupSK/K9hDZ
+                  MypIN/WUMEYInqCnR9W400l6DXhV53ARZuz0MITYUpA5S0NfP0UW68Bx</ds:X509Certificate>
             </ds:X509Data>
          </ds:KeyInfo>
       </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                              Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST"
-                                   index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign"
-                                   index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/Artifact"
-                                   index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/ECP"
-                                   index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML/POST"
-                                   index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-                                   Location="https://archive.mpi.nl/Shibboleth.sso/SAML/Artifact"
-                                   index="6"/>
-      <md:AttributeConsumingService index="1">
-         <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Archive</md:ServiceName>
-         <md:ServiceDescription xml:lang="en">Research Data Archive at the Max Planck Institute for Psycholinguistics</md:ServiceDescription>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SLO/POST"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+         Location="https://archive.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+         Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://archive.mpi.nl/Shibboleth.sso/NIM/POST"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST"
+         index="1"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign"
+         index="2"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/Artifact"
+         index="3"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/ECP"
+         index="4"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML/POST"
+         index="5"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
+         Location="https://archive.mpi.nl/Shibboleth.sso/SAML/Artifact"
+         index="6"/>
+      <md:AttributeConsumingService
+         index="1">
+         <md:ServiceName
+            xml:lang="en">Max Planck Institute for Psycholinguistics Archive</md:ServiceName>
+         <md:ServiceDescription
+            xml:lang="en">Research Data Archive at the Max Planck Institute for
+            Psycholinguistics</md:ServiceDescription>
          <!-- SAML1 -->
-         <RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                             Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
-                             NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                             isRequired="true"/>
-         <RequestedAttribute FriendlyName="mail"
-                             Name="urn:mace:dir:attribute-def:mail"
-                             NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                             isRequired="false"/>
+         <RequestedAttribute
+            FriendlyName="eduPersonPrincipalName"
+            Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
+            NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+            isRequired="true"/>
+         <RequestedAttribute
+            FriendlyName="mail"
+            Name="urn:mace:dir:attribute-def:mail"
+            NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+            isRequired="false"/>
          <!-- SAML2 -->
-         <RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                             Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                             isRequired="true"/>
-         <RequestedAttribute FriendlyName="mail"
-                             Name="urn:oid:0.9.2342.19200300.100.1.3"
-                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                             isRequired="false"/>
+         <RequestedAttribute
+            FriendlyName="eduPersonPrincipalName"
+            Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            isRequired="true"/>
+         <RequestedAttribute
+            FriendlyName="mail"
+            Name="urn:oid:0.9.2342.19200300.100.1.3"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            isRequired="false"/>
       </md:AttributeConsumingService>
    </md:SPSSODescriptor>
    <md:Organization>
-      <md:OrganizationName xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationName>
-      <md:OrganizationName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationName>
-      <md:OrganizationName xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationName>
-      <md:OrganizationName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Archive</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek Archief</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik Archiv</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan Arkiston</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://archive.mpi.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="nl">https://archive.mpi.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="de">https://archive.mpi.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fi">https://archive.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationName
+         xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationName>
+      <md:OrganizationDisplayName
+         xml:lang="en">Max Planck Institute for Psycholinguistics
+         Archive</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek
+         Archief</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="de">Max-Planck-Institut für Psycholinguistik Archiv</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="fi">Max Planck Instituutti Psykolingvistiikan
+         Arkiston</md:OrganizationDisplayName>
+      <md:OrganizationURL
+         xml:lang="en">https://archive.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="nl">https://archive.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="de">https://archive.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="fi">https://archive.mpi.nl/</md:OrganizationURL>
    </md:Organization>
-   <md:ContactPerson contactType="support">
+   <md:ContactPerson
+      contactType="support">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
    </md:ContactPerson>
-   <md:ContactPerson contactType="administrative">
+   <md:ContactPerson
+      contactType="administrative">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
    </md:ContactPerson>
-   <md:ContactPerson contactType="technical">
+   <md:ContactPerson
+      contactType="technical">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
diff --git a/metadata/sp.mpi.nl.xml b/metadata/sp.mpi.nl.xml
index 7cad2a6..e829dcb 100644
--- a/metadata/sp.mpi.nl.xml
+++ b/metadata/sp.mpi.nl.xml
@@ -1,156 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                     xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                     xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
-                     xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:remd="http://refeds.org/metadata"
-                     xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-                     xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-                     xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     entityID="https://sp.mpi.nl">
+<md:EntityDescriptor
+   xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+   xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+   xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+   xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+   xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+   xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+   xmlns:remd="http://refeds.org/metadata"
+   xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   entityID="https://sp.mpi.nl">
    <md:Extensions>
       <mdattr:EntityAttributes>
-         <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                         Name="http://macedir.org/entity-category">
+         <saml:Attribute
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            Name="http://macedir.org/entity-category">
             <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
          </saml:Attribute>
-         <saml:Attribute Name="http://macedir.org/entity-category"
-                         NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+         <saml:Attribute
+            Name="http://macedir.org/entity-category"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
             <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
          </saml:Attribute>
-         <saml:Attribute Name="http://macedir.org/entity-category"
-                         NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+         <saml:Attribute
+            Name="http://macedir.org/entity-category"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
             <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
          </saml:Attribute>
       </mdattr:EntityAttributes>
    </md:Extensions>
-   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+   <md:SPSSODescriptor
+      protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
       <md:Extensions>
          <mdui:UIInfo>
-            <mdui:DisplayName xml:lang="en">MPI for Psycholinguistics</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="nl">MPI voor Psycholinguïstiek</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="de">MPI für Psycholinguistik</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="fi">MPI Psykolingvistiikan</mdui:DisplayName>
-            <mdui:Description xml:lang="en">Service Provider for Data and Services hosted at the Max Planck Institute for Psycholinguistics</mdui:Description>
-            <mdui:Description xml:lang="nl">Service Provider voor Data en Diensten gehost bij het Max Planck Instituut voor Psycholinguïstiek</mdui:Description>
-            <mdui:Description xml:lang="de">Service Provider für Daten und Dienstleistungen am Max-Planck-Institut für Psycholinguistik</mdui:Description>
-            <mdui:Description xml:lang="fi">Palveluntarjoaja tietoja ja palveluista, jotka isännöi Max Planck Instituutti Psykolingvistiikan</mdui:Description>
-            <mdui:Keywords xml:lang="en">Max+Planck+Institute Psycholinguistics Language Research Data Services</mdui:Keywords>
-            <mdui:Keywords xml:lang="nl">Max+Planck+Instituut Psycholinguïstiek Taal Onderzoeksdata Diensten</mdui:Keywords>
-            <mdui:Keywords xml:lang="de">Max-Planck-Institut Psycholinguistik Sprache Forschungsdaten Dienstleistungen</mdui:Keywords>
-            <mdui:Keywords xml:lang="fi">Max+Planck+Instituutti Psykolingvistiikan Kieli Tutkimustiedot Palvelut</mdui:Keywords>
-            <mdui:Logo height="495" width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</mdui:Logo>
-            <mdui:Logo height="89" width="90">https://sp.mpi.nl/gif/mpg-logo-90.png</mdui:Logo>
-            <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
-            <mdui:PrivacyStatementURL xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</mdui:PrivacyStatementURL>
+            <mdui:DisplayName
+               xml:lang="en">MPI for Psycholinguistics</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="nl">MPI voor Psycholinguïstiek</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="de">MPI für Psycholinguistik</mdui:DisplayName>
+            <mdui:DisplayName
+               xml:lang="fi">MPI Psykolingvistiikan</mdui:DisplayName>
+            <mdui:Description
+               xml:lang="en">Service Provider for Data and Services hosted at the Max Planck
+               Institute for Psycholinguistics</mdui:Description>
+            <mdui:Description
+               xml:lang="nl">Service Provider voor Data en Diensten gehost bij het Max Planck
+               Instituut voor Psycholinguïstiek</mdui:Description>
+            <mdui:Description
+               xml:lang="de">Service Provider für Daten und Dienstleistungen am Max-Planck-Institut
+               für Psycholinguistik</mdui:Description>
+            <mdui:Description
+               xml:lang="fi">Palveluntarjoaja tietoja ja palveluista, jotka isännöi Max Planck
+               Instituutti Psykolingvistiikan</mdui:Description>
+            <mdui:Keywords
+               xml:lang="en">Max+Planck+Institute Psycholinguistics Language Research Data
+               Services</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="nl">Max+Planck+Instituut Psycholinguïstiek Taal Onderzoeksdata
+               Diensten</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="de">Max-Planck-Institut Psycholinguistik Sprache Forschungsdaten
+               Dienstleistungen</mdui:Keywords>
+            <mdui:Keywords
+               xml:lang="fi">Max+Planck+Instituutti Psykolingvistiikan Kieli Tutkimustiedot
+               Palvelut</mdui:Keywords>
+            <mdui:Logo
+               height="495"
+               width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</mdui:Logo>
+            <mdui:Logo
+               height="89"
+               width="90">https://sp.mpi.nl/gif/mpg-logo-90.png</mdui:Logo>
+            <mdui:InformationURL
+               xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+            <mdui:PrivacyStatementURL
+               xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</mdui:PrivacyStatementURL>
          </mdui:UIInfo>
-         <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                                Location="https://sp.mpi.nl/Shibboleth.sso/Login"/>
-         <idpdisc:DiscoveryResponse index="1"
-                                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                                    Location="https://sp.mpi.nl/Shibboleth.sso/Login"/>
+         <init:RequestInitiator
+            Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+            Location="https://sp.mpi.nl/Shibboleth.sso/Login"/>
+         <idpdisc:DiscoveryResponse
+            index="1"
+            Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+            Location="https://sp.mpi.nl/Shibboleth.sso/Login"/>
       </md:Extensions>
       <md:KeyDescriptor>
          <ds:KeyInfo>
             <ds:X509Data>
-               <ds:X509Certificate>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</ds:X509Certificate>
+               <ds:X509Certificate>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</ds:X509Certificate>
             </ds:X509Data>
          </ds:KeyInfo>
       </md:KeyDescriptor>
       <md:KeyDescriptor>
          <ds:KeyInfo>
             <ds:X509Data>
-               <ds:X509Certificate>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</ds:X509Certificate>
+               <ds:X509Certificate>MIIHdjCCBV6gAwIBAgIQIjDdSbL1CR4OsjcnV9Jm9TANBgkqhkiG9w0BAQwFADBE
+                  MQswCQYDVQQGEwJOTDEZMBcGA1UEChMQR0VBTlQgVmVyZW5pZ2luZzEaMBgGA1UE
+                  AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjMwMTEwMDAwMDAwWhcNMjQwMTEwMjM1
+                  OTU5WjB7MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5ZXJuMUcwRQYDVQQKDD5N
+                  YXgtUGxhbmNrLUdlc2VsbHNjaGFmdCB6dXIgRsO2cmRlcnVuZyBkZXIgV2lzc2Vu
+                  c2NoYWZ0ZW4gZS5WLjESMBAGA1UEAxMJc3AubXBpLm5sMIIBIjANBgkqhkiG9w0B
+                  AQEFAAOCAQ8AMIIBCgKCAQEAzC4CF9XH+P3a97mwn/BOL4oA1m5R5YFPSPlqA1X2
+                  Aa9Xlo4Q7qFcr5jKU7YkmG3dslYm0OLvWAUju8TDdGC0wjbEVZQmhMYQ/0erg3B4
+                  k/3Cj48z9SRJswku15/e5RVKr/6q5wxgvkbhMCQ6yFqo9GA3vxOyL3Dn7FJ8Zfyc
+                  jVtiJ35Z7PKuWTDllZaVKXUHte1q/6poe6/IT7+nEnO+LKZKPDirAWccbKgy+1Mh
+                  U98fibWALGvgJJb7paB3rM6BoOxcTb3RZtrTSyOALIoUzEDNlCpfgL0u9xOFot8u
+                  +84UyflNbIW9AegHKHtI3ARk09n4OdGNMwyiqA0IUZEr2QIDAQABo4IDKzCCAycw
+                  HwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFFmCYNUJ
+                  7eqP4Uc76EFbsXobxPhsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+                  A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQB
+                  sjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgG
+                  BmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3Rp
+                  Z28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEF
+                  BQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0
+                  LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20w
+                  ggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB2AHb/iD8KtvuVUcJhzPWHujS0pM27
+                  KdxoQgqf5mdMWjp0AAABhZkdmMEAAAQDAEcwRQIgUa0UmgguYoo3d2X8CA9hcOj7
+                  R6X0PEKj0JErkmjiRKkCIQC/eaEbgM6zjSTK/PBTwYQ/2Ozq6E5zDHVyxoNZhr/o
+                  JgB1ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2kPTBI1/urAAABhZkdmKoAAAQD
+                  AEYwRAIgI8UvY8mTuqt950StabgHHXVkQcDNQ1nXF+nXPZeF2MMCIA4PSvWiyqtD
+                  M5Uz/Go8xGSj/M++d04HbxFpnU53/78HAHYA7s3QZNXbGs7FXLedtM0TojKHRny8
+                  7N7DUUhZRnEftZsAAAGFmR2YZwAABAMARzBFAiAsX3ZDLilWQyKZx5kEt2T3Z86i
+                  rVYWkmlh2HSkUO4QHwIhAMBJPChECKquNg2IRmqqFRw0NjOPlOwp+v5QiawNHGqI
+                  MCQGA1UdEQQdMBuCCXNwLm1waS5ubIIOYXJjaGl2ZS5tcGkubmwwDQYJKoZIhvcN
+                  AQEMBQADggIBAA2K4JeBaTDI/glTpTNt03QAB0xefw1JE8iUbHiGs39IeeqtgFfb
+                  W2ixUJJzXhgA+bTWwG7g4u3I1nba/3AAwpXeFyNyJXipk4GO1N7AS+WY9d+9DfcO
+                  WMF20rwXsSqAD2UpvSXs4b+pu+6+RJNTPyZBjtsu+G9SuC2CWgq/hd5+qCtE558+
+                  xIRZqLniYi2EhtJSh5BLt6k0pDj/bQorPjdqG6HyH3gyTaNR6hG0DNPE4hGy6vda
+                  ZvYROb1jWyP+uzE8IrGOElrEBLQ74sJUHYayCe0v1MF1pW/EvJqeq/ThWfRpJ2/h
+                  wPmo0l8TlWCx6kQ+xNLsN62eoIsbSJpNZHI3aWbUPSqEEfAF6nDjoOjPGdXOUG6C
+                  uI5y360eVBfQP3PewpBwWHoffg39QPkeYAf0ODsYmV+EMiQ+/sL6SoEcAkVzgfI0
+                  OZamXsD6yBuSzJkBJNOjZN6sPAE/cOYxt9PcgGdg0sbKbRL0jW3ZhpBvLSetm1Vg
+                  3Z29vuIyvI1v8+iVHAhV+Atf/Gv0hmevzOMLC2rqNKaDPLqk/vkY+AV7mdtyTMOP
+                  ipXvKlE/glTqyn0dov+QDWvhKwYEICrkKVsJamUlB9OnvaQwsbvQESupSK/K9hDZ
+                  MypIN/WUMEYInqCnR9W400l6DXhV53ARZuz0MITYUpA5S0NfP0UW68Bx</ds:X509Certificate>
             </ds:X509Data>
          </ds:KeyInfo>
       </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                              Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST"
-                                   index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign"
-                                   index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/Artifact"
-                                   index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/ECP"
-                                   index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML/POST"
-                                   index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-                                   Location="https://sp.mpi.nl/Shibboleth.sso/SAML/Artifact"
-                                   index="6"/>
-      <md:AttributeConsumingService index="1">
-         <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Data and Services</md:ServiceName>
-         <md:ServiceDescription xml:lang="en">Research Data and Services hosted at the Max Planck Institute for Psycholinguistics</md:ServiceDescription>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SLO/POST"/>
+      <md:SingleLogoutService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+         Location="https://sp.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+         Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://sp.mpi.nl/Shibboleth.sso/NIM/POST"/>
+      <md:ManageNameIDService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST"
+         index="1"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign"
+         index="2"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/Artifact"
+         index="3"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/ECP"
+         index="4"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML/POST"
+         index="5"/>
+      <md:AssertionConsumerService
+         Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
+         Location="https://sp.mpi.nl/Shibboleth.sso/SAML/Artifact"
+         index="6"/>
+      <md:AttributeConsumingService
+         index="1">
+         <md:ServiceName
+            xml:lang="en">Max Planck Institute for Psycholinguistics Data and
+            Services</md:ServiceName>
+         <md:ServiceDescription
+            xml:lang="en">Research Data and Services hosted at the Max Planck Institute for
+            Psycholinguistics</md:ServiceDescription>
          <!-- SAML1 -->
-         <RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                             Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
-                             NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                             isRequired="true"/>
-         <RequestedAttribute FriendlyName="mail"
-                             Name="urn:mace:dir:attribute-def:mail"
-                             NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                             isRequired="false"/>
+         <RequestedAttribute
+            FriendlyName="eduPersonPrincipalName"
+            Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
+            NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+            isRequired="true"/>
+         <RequestedAttribute
+            FriendlyName="mail"
+            Name="urn:mace:dir:attribute-def:mail"
+            NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+            isRequired="false"/>
          <!-- SAML2 -->
-         <RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                             Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                             isRequired="true"/>
-         <RequestedAttribute FriendlyName="mail"
-                             Name="urn:oid:0.9.2342.19200300.100.1.3"
-                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                             isRequired="false"/>
+         <RequestedAttribute
+            FriendlyName="eduPersonPrincipalName"
+            Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            isRequired="true"/>
+         <RequestedAttribute
+            FriendlyName="mail"
+            Name="urn:oid:0.9.2342.19200300.100.1.3"
+            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+            isRequired="false"/>
       </md:AttributeConsumingService>
    </md:SPSSODescriptor>
    <md:Organization>
-      <md:OrganizationName xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationName>
-      <md:OrganizationName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationName>
-      <md:OrganizationName xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationName>
-      <md:OrganizationName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mpi.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="nl">http://www.mpi.nl/nederlands</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="de">http://www.mpi.nl/deutsch</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fi">http://www.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationName
+         xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationName>
+      <md:OrganizationName
+         xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationName>
+      <md:OrganizationDisplayName
+         xml:lang="en">Max Planck Institute for Psycholinguistics</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="de">Max-Planck-Institut für Psycholinguistik</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName
+         xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</md:OrganizationDisplayName>
+      <md:OrganizationURL
+         xml:lang="en">http://www.mpi.nl/</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="nl">http://www.mpi.nl/nederlands</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="de">http://www.mpi.nl/deutsch</md:OrganizationURL>
+      <md:OrganizationURL
+         xml:lang="fi">http://www.mpi.nl/</md:OrganizationURL>
    </md:Organization>
-   <md:ContactPerson contactType="support">
+   <md:ContactPerson
+      contactType="support">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
    </md:ContactPerson>
-   <md:ContactPerson contactType="administrative">
+   <md:ContactPerson
+      contactType="administrative">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
    </md:ContactPerson>
-   <md:ContactPerson contactType="technical">
+   <md:ContactPerson
+      contactType="technical">
       <md:GivenName>Tobias</md:GivenName>
       <md:SurName>van Valkenhoef</md:SurName>
       <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>