testing metadata for nya

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@425 0878fbc5-a6f2-46f6-b174-cb7b08c221d1
author: leifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1> 2010-09-18 10:52:45 +0000
committer: leifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1> 2010-09-18 10:52:45 +0000
commit: b2cb8affd2ba5be2c932aef2860f7bee59eff4ac (patch)
tree: 6229dc1ca9ea5994480b664821d3a91e02a10147 /nya-1.0
parent: a0290cf0c5be737cb9224c4e6a4a9ea3bd03b50d (diff)
65 files changed, 4882 insertions, 0 deletions
diff --git a/nya-1.0/ab11.ladok.umu.se-aws-sp.xml b/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..97b6beb7
--- /dev/null
+++ b/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_92994cbbd74454f907ca9ce9400e0f4b" entityID="https://ab11.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
+NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
+vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
+jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
+ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
+JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
+INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
+KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
+qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
+cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
+bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
+lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
+oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
+NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
+vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
+jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
+ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
+JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
+INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
+KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
+qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
+cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
+bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
+lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
+oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/ab11.ladok.umu.se-dw-idp.xml b/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..60ee337e
--- /dev/null
+++ b/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ab11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://ab11.ladok.umu.se:8450/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://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://ab11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ab11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml b/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ebc055fd
--- /dev/null
+++ b/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_c90fb725a0300ac7d6056c542385d110" entityID="https://ab11.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
+NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
+x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
+mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
+km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
+Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
+Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
+KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
+qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
+Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
+ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
+bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
+BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
+NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
+x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
+mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
+km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
+Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
+Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
+KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
+qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
+Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
+ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
+bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
+BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..3b2fb739
--- /dev/null
+++ b/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ab11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://ab11.ladok.umu.se:8448/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://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://ab11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ab11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/at11.ladok.umu.se-aws-sp.xml b/nya-1.0/at11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..c0c00789
--- /dev/null
+++ b/nya-1.0/at11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_4093d745bdeb20ddc93e0a07d380c761" entityID="https://at11.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
+NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
+3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
+5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
+3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
+L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
+hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
+KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
+woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
+HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
+IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
+6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
+/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
+NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
+3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
+5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
+3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
+L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
+hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
+KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
+woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
+HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
+IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
+6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
+/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/at11.ladok.umu.se-dw-idp.xml b/nya-1.0/at11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..221c03a6
--- /dev/null
+++ b/nya-1.0/at11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://at11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://at11.ladok.umu.se:8450/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://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://at11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://at11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/at11.ladok.umu.se-ecs-sp.xml b/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..1cc69974
--- /dev/null
+++ b/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_bf6a96fc8528463894554825af21b283" entityID="https://at11.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
+NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
+q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
+psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
+dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
+kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
+PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
+KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
+cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
+FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
+tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
+NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
+DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
+NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
+q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
+psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
+dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
+kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
+PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
+KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
+cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
+FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
+tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
+NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
+DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..a0a11a42
--- /dev/null
+++ b/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://at11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://at11.ladok.umu.se:8448/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://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://at11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://at11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..0550a3f4
--- /dev/null
+++ b/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://dwidp.testc.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://dwidp.testc.ladok.umu.se/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..e405addb
--- /dev/null
+++ b/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://dwidp.testd.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://dwidp.testd.ladok.umu.se/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/ft11.ladok.umu.se-aws-sp.xml b/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..c488f88e
--- /dev/null
+++ b/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_cc5d33937b72da0707a2734c243a7f99" entityID="https://ft11.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
+NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
+5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
+ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
+GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
+O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
+hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
+KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
+o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
+gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
++eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
+mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
+Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
+NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
+5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
+ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
+GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
+O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
+hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
+KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
+o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
+gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
++eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
+mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
+Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/ft11.ladok.umu.se-dw-idp.xml b/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..4901b91d
--- /dev/null
+++ b/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ft11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://ft11.ladok.umu.se:8450/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://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://ft11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ft11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml b/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..df288c1b
--- /dev/null
+++ b/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_547a367c1c8935a85004642cc86971ad" entityID="https://ft11.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
+NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
+aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
+NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
+PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
+cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
+AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
+KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
+SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
+o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
+aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
+ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
+pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
+NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
+aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
+NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
+PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
+cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
+AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
+KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
+SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
+o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
+aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
+ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
+pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c9df8915
--- /dev/null
+++ b/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ft11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://ft11.ladok.umu.se:8448/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://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://ft11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ft11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/it11.ladok.umu.se-aws-sp.xml b/nya-1.0/it11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..f97eb401
--- /dev/null
+++ b/nya-1.0/it11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_c64eb6b2a66e23905011689fee5bdeb0" entityID="https://it11.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://it11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
+NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
+saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
+LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
+56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
+0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
+kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
+KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
+j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
+aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
+wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
+sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
+FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://it11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
+NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
+saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
+LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
+56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
+0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
+kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
+KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
+j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
+aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
+wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
+sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
+FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/it11.ladok.umu.se-dw-idp.xml b/nya-1.0/it11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..7e15e626
--- /dev/null
+++ b/nya-1.0/it11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://it11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://it11.ladok.umu.se:8450/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://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://it11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://it11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/it11.ladok.umu.se-ecs-sp.xml b/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..e59bd3e2
--- /dev/null
+++ b/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b8921b42d2f61cbe60bc567903fd2ca3" entityID="https://it11.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://it11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
+NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
+QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
+UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
+hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
+pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
+WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
+KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
+qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
+xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
+IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
+DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
+covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://it11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
+NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
+QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
+UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
+hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
+pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
+WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
+KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
+qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
+xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
+IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
+DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
+covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..72b0b447
--- /dev/null
+++ b/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://it11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://it11.ladok.umu.se:8448/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://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://it11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://it11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nb11.ladok.umu.se-aws-sp.xml b/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a21f3b5f
--- /dev/null
+++ b/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0a4a721c6f5d9fc61031bdefa446cd40" entityID="https://nb11.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
+NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
+25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
+MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
+8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
+T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
+vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
+KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
+iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
+Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
+zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
+kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
+Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
+NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
+25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
+MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
+8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
+T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
+vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
+KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
+iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
+Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
+zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
+kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
+Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nb11.ladok.umu.se-dw-idp.xml b/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..04956fc2
--- /dev/null
+++ b/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nb11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nb11.ladok.umu.se:8450/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://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nb11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nb11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml b/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..660cf39f
--- /dev/null
+++ b/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f5172360dcce469aaf1aab64fbb6f093" entityID="https://nb11.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
+NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
+YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
+whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
+Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
+/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
+lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
+KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
+4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
+42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
+uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
+SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
+CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
+NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
+YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
+whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
+Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
+/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
+lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
+KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
+4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
+42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
+uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
+SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
+CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..69f037dd
--- /dev/null
+++ b/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nb11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nb11.ladok.umu.se:8448/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://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nb11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nb11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..250a79f4
--- /dev/null
+++ b/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_16613b4c819a1f8653c405a4863a1668" entityID="https://nya-01.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
+MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
+1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
+Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
+DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
+Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
+uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
+O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
+SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
+l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
+Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
+LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
+ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
+MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
+1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
+Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
+DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
+Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
+uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
+O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
+SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
+l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
+Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
+LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
+ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..5a0b2e15
--- /dev/null
+++ b/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-01.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-01.ladok.umu.se:8450/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://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-01.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-01.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..13fe3c23
--- /dev/null
+++ b/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_57308edcca653150d19bd5deea18aefe" entityID="https://nya-01.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
+MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
+zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
+fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
+xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
+3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
+AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
+I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
+gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
+45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
+HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
+AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
+qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
+MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
+zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
+fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
+xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
+3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
+AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
+I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
+gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
+45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
+HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
+AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
+qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..0e487e47
--- /dev/null
+++ b/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-01.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-01.ladok.umu.se:8448/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://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-01.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-01.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..fa63c296
--- /dev/null
+++ b/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_670ca40bfa0fe7f56e09cfbe5e41fe22" entityID="https://nya-02.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
+MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
+aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
+tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
+9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
+wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
+37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
+tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
+bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
+74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
+XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
+XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
+gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
+MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
+aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
+tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
+9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
+wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
+37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
+tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
+bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
+74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
+XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
+XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
+gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..f06c9c22
--- /dev/null
+++ b/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-02.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-02.ladok.umu.se:8450/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://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-02.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-02.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..b9cc008a
--- /dev/null
+++ b/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0497930777193fa693ad36a088e6a8f6" entityID="https://nya-02.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
+MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
+yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
++YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
+eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
+wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
+NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
+KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
+31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
+xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
+QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
+fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
+lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
+MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
+yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
++YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
+eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
+wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
+NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
+KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
+31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
+xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
+QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
+fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
+lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c454002f
--- /dev/null
+++ b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-02.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-02.ladok.umu.se:8448/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://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-02.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-02.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..f3e0877d
--- /dev/null
+++ b/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9e3cfa795b690b5c3e05257503b7603f" entityID="https://nya-03.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
+MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
+ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
+h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
+2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
+Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
+NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
+T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
+OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
+0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
+2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
+IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
+VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
+MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
+ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
+h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
+2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
+Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
+NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
+T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
+OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
+0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
+2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
+IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
+VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..3b467bc7
--- /dev/null
+++ b/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-03.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-03.ladok.umu.se:8448/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://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-03.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-03.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..f75019a7
--- /dev/null
+++ b/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_63704a1b68be46f1eb55e89a96e4941b" entityID="https://nya-04.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
+MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
+LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
+jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
+AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
+hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
+UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
+NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
+Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
+aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
+mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
+ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
+nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
+MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
+LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
+jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
+AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
+hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
+UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
+NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
+Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
+aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
+mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
+ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
+nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..7bafe764
--- /dev/null
+++ b/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-04.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-04.ladok.umu.se:8450/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://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-04.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-04.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..789e432f
--- /dev/null
+++ b/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ba27109e3c3eb7d4b9c6240a25bbbc01" entityID="https://nya-04.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
+MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
+QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
+HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
+fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
+RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
+2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
+HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
+rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
+QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
+zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
+OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
+IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
+MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
+QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
+HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
+fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
+RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
+2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
+HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
+rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
+QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
+zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
+OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
+IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c1056999
--- /dev/null
+++ b/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-04.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-04.ladok.umu.se:8448/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://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-04.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-04.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..02510083
--- /dev/null
+++ b/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9920e2a9defb929ab7827bacbf6f4575" entityID="https://nya-05.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
+MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
+NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
+PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
+QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
+wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
+uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
+8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
+vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
+/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
+gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
+QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
+EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
+MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
+NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
+PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
+QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
+wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
+uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
+8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
+vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
+/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
+gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
+QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
+EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..9daa35c9
--- /dev/null
+++ b/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-05.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-05.ladok.umu.se:8450/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://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-05.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-05.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..c70e3dc4
--- /dev/null
+++ b/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_78e1bec20441635ab48623a888f3b02d" entityID="https://nya-05.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
+MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
+7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
+OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
+4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
+EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
+6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
+VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
+ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
+HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
+yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
+PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
+oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
+MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
+7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
+OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
+4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
+EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
+6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
+VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
+ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
+HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
+yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
+PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
+oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..3f9a8b5a
--- /dev/null
+++ b/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-05.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-05.ladok.umu.se:8448/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://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-05.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-05.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..764d9e9a
--- /dev/null
+++ b/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_985d8dc6dad13f30fb91794a363231fe" entityID="https://nya-06.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
+MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
+8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
+Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
+/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
+EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
+23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
+R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
+0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
+XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
+vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
+dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
+6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
+MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
+8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
+Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
+/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
+EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
+23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
+R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
+0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
+XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
+vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
+dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
+6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..b2f060eb
--- /dev/null
+++ b/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-06.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-06.ladok.umu.se:8450/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://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-06.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-06.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..82b32fdc
--- /dev/null
+++ b/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_2a260cdccbac118390ea16bb5108efb3" entityID="https://nya-06.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
+MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
+UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
+TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
+54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
+8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
+NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
+2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
+67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
+NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
+O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
+08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
+vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
+MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
+UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
+TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
+54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
+8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
+NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
+2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
+67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
+NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
+O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
+08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
+vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..bac42759
--- /dev/null
+++ b/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-06.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-06.ladok.umu.se:8448/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://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-06.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-06.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..162e1e71
--- /dev/null
+++ b/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_39dfcaa3da3bbfc66c3cdbc37ac2d221" entityID="https://nya-07.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
+MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
+Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
+Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
+0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
+J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
+zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
+txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
+yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
+8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
+IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
+JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
+OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
+MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
+Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
+Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
+0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
+J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
+zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
+txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
+yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
+8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
+IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
+JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
+OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..014ff826
--- /dev/null
+++ b/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-07.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-07.ladok.umu.se:8450/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://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-07.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-07.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..eb9e77be
--- /dev/null
+++ b/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_995fd1b84734e1bd25b98ad3ebc6673a" entityID="https://nya-07.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
+MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
+bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
+5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
+hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
+EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
+o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
+/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
+48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
+fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
+CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
+wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
+OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
+MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
+bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
+5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
+hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
+EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
+o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
+/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
+48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
+fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
+CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
+wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
+OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..caaeb03c
--- /dev/null
+++ b/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-07.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-07.ladok.umu.se:8448/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://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-07.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-07.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..86104407
--- /dev/null
+++ b/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6069bbc11a207cd92832ebb7b1801731" entityID="https://nya-08.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
+MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
+sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
+RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
+/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
+hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
+ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
++L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
+c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
+qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
+KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
+2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
+iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
+MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
+sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
+RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
+/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
+hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
+ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
++L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
+c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
+qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
+KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
+2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
+iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..443f9cbe
--- /dev/null
+++ b/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-08.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-08.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-08.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..8b645550
--- /dev/null
+++ b/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_65fcbca1a0a696ad6614438fedcf0e5e" entityID="https://nya-09.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
+MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
+I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
+SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
+I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
+rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
+qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
+9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
+atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
+qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
+MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
+p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
+O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
+MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
+I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
+SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
+I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
+rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
+qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
+9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
+atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
+qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
+MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
+p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
+O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..15cd8954
--- /dev/null
+++ b/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-09.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-09.ladok.umu.se:8450/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://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-09.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-09.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..b63819bd
--- /dev/null
+++ b/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_393a45f0f96859eaec2134221dcd9e34" entityID="https://nya-09.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
+MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
+1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
+xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
+scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
+KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
+vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
+5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
+5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
+eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
+ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
+Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
+ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
+MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
+1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
+xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
+scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
+KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
+vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
+5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
+5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
+eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
+ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
+Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
+ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..fd3789e8
--- /dev/null
+++ b/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-09.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-09.ladok.umu.se:8448/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://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-09.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-09.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..2bc96558
--- /dev/null
+++ b/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_15546213e9a26eebabd4496a578d1d6a" entityID="https://nya-10.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
+MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
+5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
+5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
+naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
+hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
+hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
+GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
+FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
+vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
+uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
+Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
+dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
+MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
+5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
+5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
+naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
+hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
+hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
+GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
+FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
+vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
+uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
+Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
+dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..ee1978fd
--- /dev/null
+++ b/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-10.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-10.ladok.umu.se:8450/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://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-10.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-10.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ea80ece9
--- /dev/null
+++ b/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3fc97875790443380cbf93498b71542a" entityID="https://nya-10.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
+MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
+ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
+crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
+Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
+KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
+6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
+/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
+5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
+JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
+pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
+zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
+H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
+MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
+ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
+crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
+Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
+KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
+6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
+/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
+5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
+JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
+pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
+zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
+H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..199df928
--- /dev/null
+++ b/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-10.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://nya-10.ladok.umu.se:8448/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://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://nya-10.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-10.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..204fa703
--- /dev/null
+++ b/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.testd.ladok.umu.se:444/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/wb11.ladok.umu.se-dw-idp.xml b/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..020135dc
--- /dev/null
+++ b/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://wb11.ladok.umu.se/dw-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://wb11.ladok.umu.se:8450/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://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://wb11.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://wb11.ladok.umu.se:8450/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..094a0999
--- /dev/null
+++ b/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://wb11.ladok.umu.se/shibboleth-idp"
+                  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">
+
+    <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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://wb11.ladok.umu.se:8448/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://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://wb11.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://wb11.ladok.umu.se:8448/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>
+    
+</EntityDescriptor>    
diff --git a/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..2ab622f8
--- /dev/null
+++ b/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,78 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6b824da09ba10915316487b279434d44" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
+ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
+mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
+/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
+K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
+RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
+CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
+MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
+no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
+49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
+oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
+oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
+LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
+ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
+mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
+/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
+K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
+RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
+CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
+MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
+no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
+49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
+oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
+oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
+LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://http-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://http-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..1c86af29
--- /dev/null
+++ b/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,78 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_76653cea95952b9e35f311cf0f83d19b" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
+bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
+l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
+7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
+ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
+Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
+wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
+qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
+eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
+AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
+RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
+s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
+bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
+l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
+7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
+ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
+Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
+wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
+qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
+eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
+AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
+RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
+s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testd02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testd02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml b/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..794f5d25
--- /dev/null
+++ b/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,78 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_5a9e2b540c30022eae2050491c571a29" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
+y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
+OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
+QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
+n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
+3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
+5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
+MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
+UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
+53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
+iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
+KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
+Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
+y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
+OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
+QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
+n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
+3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
+5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
+MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
+UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
+53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
+iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
+KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
+Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://http-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://http-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://http-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
diff --git a/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml b/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..7143edb8
--- /dev/null
+++ b/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,78 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6c99e5bfe44c5e5ed590bafee54b6671" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
+eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
+bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
+FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
+WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
+goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
+QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
+MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
+lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
+v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
+To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
+DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
+dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
+eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
+bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
+FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
+WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
+goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
+QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
+MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
+lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
+v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
+To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
+DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
+dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testd01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testd01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testd01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
+\ No newline at end of file
author	leifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1>	2010-09-18 10:52:45 +0000
committer	leifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1>	2010-09-18 10:52:45 +0000
commit	b2cb8affd2ba5be2c932aef2860f7bee59eff4ac (patch)
tree	6229dc1ca9ea5994480b664821d3a91e02a10147 /nya-1.0
parent	a0290cf0c5be737cb9224c4e6a4a9ea3bd03b50d (diff)