resolves SWAMIDOPS-6453

76 files changed, 4635 insertions, 0 deletions

diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a1ee176c
--- /dev/null
+++ b/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_24a7979d5c585ea851b01f67fb63549292f39438" entityID="https://nya-36.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-36.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALhK1Y9fpmtHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwOTU4WhcNMjIwMjE3
+MTIwOTU4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl2sWYZR3jZWNdn+mvD+fAQI9NdpaAQGd
+NnRjHYaYfUW145+h3mrzQg5kxrfC+EvN6+T6cJsNtrHoTquupXtbfGoxQZQ0CIuL
+FfnyNjETW72gpwGoezdXz2DIGI83CC9KmiUpFHDVcqK/DjWMNhhbqSe2sTVLZHq5
+BfIYFn2oZ+CFrhKPbCMHeXrAfRXHUqkezRIDYZQ4Xjh6IrpoXfEUZE5bl79Ya+Re
+zFpflBgKIJz1r08qQM69uTkUtm4YJamqiaED+TB+YMBRD74fbYtlLKedjThzy25j
+/G25B+AQ5JDOQybWGhajgk6L+sPCdkQ++yJKQin8alqU1GgO5q1kbQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzYubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBREAxTVc+1fC+5MvURg
+VAmm5tdP7zANBgkqhkiG9w0BAQUFAAOCAQEAIsLGcRyLpB+H9XtfUyigRA1LoGKv
+nzjxVGyKT0QlML6T/MMETEippnm/iDR4DxxK8JRgNu8L1OpnJTACmL8qWBSUnDRG
+jw9CFfIvfUksy6Y6Yxlee/gQXa7cGXOZMKIBTsKT26ZjB5bc3030j9iIJWgX5q8X
+ruGz8wVhMAG+NuRhdUkZZmgMnVNNiibMmFwP/uzjbgADy5BzB9iaCXLuVL8amRzA
+vXDXzJgkSeaGxlwmRVhzSO53eNo3Pu+NrN/FsrhgcRETjaaFTHCQjDS3yhCWVgkT
+fR7Mgv7dwRyEa5eRgSTdxngJEIQ2/96kThMvqEOn8M85N51fr/8jQaPrRQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..11035cad
--- /dev/null
+++ b/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fb1ab70cc94a333532da92d72733f760b7382a21" entityID="https://nya-36.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-36.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJhj1Ojd9/n5MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTMwWhcNMjIwMjE3
+MTIwMTMwWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApflPLvKUmK5b/k9Gp3uG02LcUnwvYxFa
+6+5MUPD67KURqRMiXj0DH1TVKzMkpHr/f7vNacwMqoR7xc2fc0turYbU5HMB3Cpl
+fPFzUf8ONJFHuSpEIkIMlBrDGSFPfFSSszSE/r4gALEKx88MNSKpm3Q0XQBV2Zh9
+A7hJSN6NraVn+gEOAMv5nToxEKdzXHobf40aU/FKSPBRIYaNCBZgsm3W+bpzfM/9
+AhDI2D+V13vVLljahHvbQLl2cACyifFK2hz1BwBq3Jp47A8x5+WOfvgdGnPf51sF
+gOU7EPrOk6CSGYxyuaNrv+nhEWg8TmYhZFWPkPdhU2WOWGrSbU/dfQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzYubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQAK+ehi4cqfM0zNhI8b+yi
+lyPx+DANBgkqhkiG9w0BAQUFAAOCAQEALpUw+VfeqTN6a6p+xaBlCyZOCShUorkj
+NvmljN3T0LEtbqAMlG7J/wJXQI9OCwSOt+KU57Sh0Js/uOsKuKdWuv47B7yr9cs+
+N28071y4Z6/z47E7yVW2I3roSNIH0pW8cqu5/j3o9RNmeu4OH3JPm6ePOm6kZix9
+yi1vm+/DdR72Wvuivh0gB55nbnWY0kNZPcv6oQSeIpdd3PFzQZamsQ/0qlY5iwDi
+sLlAnf79ag27JJKfJHPCDtCVixWjvK9USSxgfvxPHP8ueEVKc3pJIGySZZWBgxbn
+wBlhut5PYW3TeSQIoUI4fZdyL+KUHhKsV5vxkWARz7ZLqFWRnDey6Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.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-36.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.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-36.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-36.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-36.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-36.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-36.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..30b3767d
--- /dev/null
+++ b/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-36.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-36.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-36.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-36.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-36.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-36.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-36.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-36.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/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..6cafa5bc
--- /dev/null
+++ b/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fd62c89bf8a254ac15159dd1eec2cc3bf7101645" entityID="https://nya-36.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-36.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJfszto/sxyMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM3WhcNMjIwMjE3
+MTIwMTM3WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAteWDe95JkvjwEfkqQcnTXixyIfxzEYh+
+ubDHutrPd6DMlx3TvU6rppxYFbbhnK6AHwiXZcl7SMu7rdMbtCKcvTg5MoI8z1tm
+Z7NIf3CssarCQ1YpesRAL42TNkrZNUMuiH5zSyQiw07GZFrVWpfu8FvEdI5n03/J
+b9Kr44nFscz/oI4ny2mitv3GsXKbuaEDlPNkCnhiUQ9tRJozi+/zs+hb1Z4VC3XV
+FBa9AAfRv6MHBwINmTLUvI3UVvJOrG7PURIm2vZ3FNFZjxK0VMScgII9AQNGS9PS
+vsWoCjmgmEUN2U4ZkX+jPZM7UCkd+TS7teU8IEypZRBypu7y/B5H5QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzYubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSG5gPXQmtag0vgGRanV2MC
+c0kDaTANBgkqhkiG9w0BAQUFAAOCAQEAg22gdr1KtpAbqIV8rqtuLi2579qL4R7O
+lIlY+RpzUkAlruwPXaRpkt3Z8nI/fY+FeTYe1jgNZYr/cMV2LFdRYs5+7AiDpsuY
+JnHYsimjD1NRdbnMRXUk9izMHfEh9NIObkvuAne9ZFWjsc9+48vEDf738IKDygCf
+gPxvBseMzp+9mqm/jVaso2R1ign73UZ1a/OHJwAD5P1e6oh/AO1EyawB0Ypg0yko
+sh5u9UJkbD9UsSbezCxSM92VAgWaslANeWtqiP+70kMN4NIjv8Yh2/J5JWIYAtGO
+mB2mFhL1WTyIupbJ+KS/jPD49LDSmC/F7wM2Yp5zyURg70eCYcoi3w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.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-36.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-36.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-36.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-36.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-36.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..4296eb6b
--- /dev/null
+++ b/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-36.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-36.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-36.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-36.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-36.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-36.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-36.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-36.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/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..395091d7
--- /dev/null
+++ b/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_dbdcf478ef7aae0395630b7afd1427d6bb40f98a" entityID="https://nya-37.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-37.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANbKMVBf0N+3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDI5WhcNMjIwMjE3
+MTIxMDI5WjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyzulq3hxPPV48zlizZtGzVIhWyrM7VjF
+ALPzpiCUUJ4f+H8kBgDFfdSL/Z95e7UMPZ97KNSRZDrcNpSCNDB0rPpoEaNP9J4D
+pJSoPy6EgHNHuGfVG3onlJWBq/WkTKQIAvimpQDXuuZXlkhtz5Htv4oesV446RpR
+CIrqL4jjYywA151P4pu9+JqX3VzEsP4U9ZhoDQ5LuelC8NCkHuo8uS7qk8LtZlxX
+QnHuE1cdkTZ6y23PmYEsE/qLDi8CYvLvSFYT1WSe+rSfw0vwnkbsRJvdTbn/uqm6
+xxcATcsjqt37K30KbBgGjQy7/fZKyJ51O56F2cb1B3QdYAnXYZETtQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzcubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTd4L1C/GA8YncgW0WO
+IkwBusLMVTANBgkqhkiG9w0BAQUFAAOCAQEAq8XwQBk0IfFpdtCietDKDdhoCDX0
+5TgcYjZTTZpTcsH0WKfJNM9BvRxRQkCsXwORoyDHW+I2v3IwqEJy9caHwdSatp0r
+xoPHJSI8v6fvq/9tyQPJrTazvhNLvkpc0izarXr+S4zttdbNuH32Twfdq0bahK7+
+0TzOErtzEcNKjNSqv6etu18MNyj9zJ71EyltODEIntHrZUQrCluV2zpthOnp333y
+gC+Zks3ZLCm1vfpCmxuxYDSk/wwNQ7FT2toFK1DB1az7cWnNRhYhcAvTD4kJNFXo
+eat0N8YeSkn/Z2DvjMf2OebesWImhtYpKpF+6q43m989s/xlg8ILDD8GGQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..ae6cfb5e
--- /dev/null
+++ b/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9ab61c89e4d9e110f7403e5c3e96040bffa26484" entityID="https://nya-37.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-37.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM1bUPj9hBiJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDI3WhcNMjIwMjE3
+MTIxMDI3WjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoq6L1KJ6F9oh2E/XRiXPPcw6jqa1YnVr
+5Sn44fwLwLGTzEER4sgyfNlYX4qq2ZWysgGpMKYSciIJLtb8rQ9QigWdzsvzNCvn
+DP6eTrojXtsj9oNtu71tgkz8A8UUORvgJkV23qycAG7tfXTTPcXHy+NXW/nLZAQV
+nonFec/yCJh/RP43q/OnUohgZTARjYh4Ftm3/C4NU9x8w7OA7cYjlrEynfVjvKus
+GEeOT86r4Xwl1XhcSgeXrU5Hk5ItT2Xb7tNMg2ZDaee/tTAHvoliGMDRvx8zj7Ny
+fi+8DD2uFh18DORfaKPLBik/Geq7M5fKGec3D79UL79Rh8snPjcTtQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzcubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTbD5e3LAGiw3bBPB87b17G
+6AQO0jANBgkqhkiG9w0BAQUFAAOCAQEAknIfDB9aLaKL7pWBQ96V8pkOyyF0leGh
+a7jlAoJzCpW5DI8SKtmc+AhW6Q/kYWDujSgqCpfUR4FKEJfCZ66S2H5EyUI0kL7V
+agmAufAjSZsTaJE5rUdrZD1iQBBBZtnswLGaHh+ldrBjUC2zwjw+C9TSm1di34Ui
+7i9RmEgsG20wLR4lci0EBtZOCWcMd2MTATMaGy7pkr2TY/65ubxzroKpjTW38fO1
+oqgNRA77DupSCZMyS5w6c9SrJT/UXga/syUhD4MRhWynix9OYHH7LesZHCmnzCzm
+ZHSe1xT7XuBxH2JFvECjWNNZArzl00djIgQjxahPpKj61g9+wwIveA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.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-37.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.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-37.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-37.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-37.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-37.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-37.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..6c755879
--- /dev/null
+++ b/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-37.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-37.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-37.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-37.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-37.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-37.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-37.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-37.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/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..c7dbeea0
--- /dev/null
+++ b/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9668fc9f7513fd02a77e6847875f2a0b16b38bab" entityID="https://nya-37.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-37.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOnNuiyORds1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMxWhcNMjIwMjE3
+MTIxMDMxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorIWTtZlDOUGWR7Rd20wAFR8Qtn8ZPen
+zEjV0TZwFEemBkP3OUwL0+27xdCFNewKBJwDfHt+S/HRFUENF8/97en38++DWN7E
+ih611nWemMAt4mPQoE8Qm7u6/niFSv/qgj2lOQitwHUnWShwWyTjITwciPI7eNcs
+9e+yP4A1UpgCaPwvFf4pBnfgTk9gTXWtI32T/MswuHgE2PZejuQnYG+akqkNU7hJ
+y80WKR+lSVem46ku+sUKsKm/CfMTYe9wNWkZ1UK4CQOYg5nCanlsR4xiGoo6rxLz
+uYe0HmdSYAnE7M96WtYbnUUbgtsLonC7Pq9cTV8JVFpUZJWPjS2krQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzcubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTdoPl4uOMwyGMrzTXGNta9
+T79VpzANBgkqhkiG9w0BAQUFAAOCAQEAoBXvgsh1tUODxw7c69L+zkgr/fJiXelp
+3yn9LDVc+AUZJwvzatLw2nUdxC5Vq9f4liH33sLc2FwMkQ/IA/oYPAmj4/N1VZHw
+/iIDTXfkCeGM4wB7Z3hE5RQgDviXw/707mdeticQVIMv8RFpennutbvUud+9EJqs
+v+MITneoX0y8YWWqNbvPF6RPba9X36+PXrsZMwidYo4KyxhITAAIz/a4VH1bkzqB
+B8esabwxhY319P25bD1QnMdw8xA6gsl005/UFrmnAyIFC/xTzc9m5J/6GzOIDtXu
+nTtTiknWevaR9hS4GeQtvdaoMIeFPrDgt+hI3VUgbif73APZm3+xBg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.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-37.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-37.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-37.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-37.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-37.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..364a30f7
--- /dev/null
+++ b/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-37.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-37.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-37.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-37.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-37.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-37.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-37.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-37.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/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..6471f340
--- /dev/null
+++ b/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f83d8bd03a18336b31e392e396a403dc926055ee" entityID="https://nya-38.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-38.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAP3TQxoDVevbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM0WhcNMjIwMjE3
+MTIxMjM0WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5K/fMqBI8h0o8uiXOtIZbYIa0X8ITE7t
+MHc61Ywwxe36E5k3acINULheM1bEN84mthOv2XCS2NEhxFBEiO6VT39pqNHkvw/i
+hbQ6ietCuiqw1AuRVJ/+EYPupqkGWSwyNMqOX4sl4/Hw9Wti64u2UIymn+eZKnOq
+K+xw95KlaX0RUasXZjI1swARKVQYD/aoI8oWInnTqVyiVYUDrF6i+IVU5sGZXZF+
+jd/Pbt8dVt2pbs03UETLPIa4wxHe8z5a6I7ltGRP3wEK4IAzDpQAFHcNy8+vdE3c
+Wa7Vlf3SCYJ8ujGaeuirUjMcOFPXylbU+41tI6W1ekdRyU9R+uWsSwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzgubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTXINB6hp450oF4/Lpy
+4eEC/OPBKDANBgkqhkiG9w0BAQUFAAOCAQEA4RPklNI5mgwFrkfedEdTY1TlHxip
+sjPgnv6v7weCbpG0nzjPyS4JXPuiqPoFgVRWNt5QGsddn5TLCg6M1X2pIrnPsCnW
+6cdXBJy+DMmxF17k5dmdI+zLICkQtGeqykmA6pdqO7amVgL4FZNx1C6cLRklxJsN
+oI9RPwUCxYYXKVEEGMPFSVOhGJb6lBRotOv5e22qBDysGQ4x1J69HIFEAP4++MWC
+mCnxI0m0/gWvTi41jCjzzb4VG59qDRq1hwDkjE67LPNHOVyJvgdFdr0WPG9qoSWa
+ouhG3uRk/VpdHB1t83UtN43XlyU/AwoVAoEIaWp45I6yl9z5QuvOdTtYRg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a19d9c60
--- /dev/null
+++ b/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_09f06cd43a2297bdb7a06c8d4bf5c967b9b00434" entityID="https://nya-38.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-38.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALKCAKyp5BqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjMxWhcNMjIwMjE3
+MTIxMjMxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo4iyqpQD7o1Xm740tHRMAX4/INyABRc5
+06Cv+iE+gJiFcTlNXeReXgsrny8a0NXcMM1YV4ChrvKNzsGwGiLcyuuI/gaRMlJg
+wASil2SqJmEYahXWgUF1cRKCfh/jpbMeoH3/4L0jN+M7hw8UN7CyS4AmrwaZfh0O
+cCJg3A9M5euLeItBO0EDAb6RYSHomom74ubu8fZz1sKL5BLItVtWIWQudES/qbsY
+WqA3JGSYtjmK9XoYQiiD2aTl8iTxt12O5begMb8/6SZtFxpwiQWxoX6+h4xCR2Ia
+4vFMjPvK6Wvev5DyVdU88j8u2xHN0ydxDG+lNzL5kUfpZgZuVr24LwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzgubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTUhKUY7DXaN1zXbkt84PPd
+q3SV2zANBgkqhkiG9w0BAQUFAAOCAQEAOQ7kjNXAGnzCENd7rM/jXQY34b3qZyC1
+1AxnFbHJ4MC4WRxyqOBVS0fmg7RXalNWc1f8LeMZsmQKjr8zOaLHFbuCB3dggdBI
+CVp2OIyJWa7P6xZEpss3Dm6Z8YxWnRXNKjhGcLgQk86y2q7TP1HbfCabrmHsfdol
+XwAsREP2ibfin+FayVjODpeqm2w4S6SVNuQDdFkJfnD0u7scmL62o62/nxw8dG4B
+85O6TjNSqGfDp7YzxjOOXrAV9Mj5stuMws8jwTM0FbddiKhWEZlbnmS25FSKDF5f
+lsGuLcchB/CZ1HM8G0wCcUEWMU8qKgs2kQFl457i3RlMt3z4wuTTKw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.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-38.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.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-38.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-38.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-38.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-38.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-38.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..f685db92
--- /dev/null
+++ b/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-38.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-38.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-38.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-38.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-38.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-38.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-38.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-38.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/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ff3536a6
--- /dev/null
+++ b/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d406d269bed5fa2f3f025b57ae3c90779c0eb0f3" entityID="https://nya-38.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-38.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOwJn0OsSBr4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM3WhcNMjIwMjE3
+MTIxMjM3WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqmqPGcsJtUeXmdEqerSLI4/ATiFLnyFR
+aQ8po9mh+xENYrTd+gwdmNGqYnJx/34J5+/ApXVSaXpnecoY7aO4iFbTkDZ8/UbL
+BDJTNn6D9bW5a/oOUEun+deJA40imJo67uSJDI5ORBKvyFtedu1c+e/rY9Z0ekdA
+J5ia7emFWOBTtTdaFu0wb2vxyoedtzTWgc1/bBozzPOxGMNh3AfzYYauDlGv0Dkf
+rmQNjC9tx5pHUDj33VD+B2duitW3F/E9x6MnKDnTNAlwKR45ZAKSRRe32kYOo0NW
+P7+juJrrZ1580l1e96NAgmYbz7Zb5F7YmKVBmby7YhIblWonjxsCIQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzgubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSMnvzBB0b5ttuCt50GpWJv
+PRLl9TANBgkqhkiG9w0BAQUFAAOCAQEACWO0qya465ugXHaimrB7wdv+gZ2nfIqd
+SlinbV9rI5SILG5JpsZKOOGd5VCAtgXR2o9XcuGZH9cCu8cioPPnzsvpA1/BaECD
+hxpRw7V1bTYlQYgk2R+YfSHcUa+QRX4JQz1weS9VmVeFxAYyokOVFk94ifbaiOkx
+Ooo9a8A6PIuxen5M3OuJmWItu6QwRCAgmn53oUx0andaWe6o4IR4czD6txjauaV+
+B2OclpTK2aa9FuM+LGCb2RIaKJjZo4llk9q89evMt8j11HLTC2HllyGeCrEQ68GD
+Nvbt/k6pfBIFhX0/mE+EqipRvValz9tDhkEWKgoD49H0JZtePcTN1g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.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-38.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-38.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-38.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-38.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-38.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c347d5ff
--- /dev/null
+++ b/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-38.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-38.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-38.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-38.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-38.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-38.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-38.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-38.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/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..0fefce94
--- /dev/null
+++ b/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_65b194fd7b2b0f560d8fab55655dad8faf7ab045" entityID="https://nya-39.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-39.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMLcJQTcOQe4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQzWhcNMjIwMjE3
+MTIxMjQzWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRuOde0c5007kuNLqN1U8mazMDFdOqZv
+d2bDxZGnLS0NNTXMStl1hsPhyVroghww4L32bcExrJRzINiuSAgS2/FQpLePadUg
+VH8XFYUZ44LGMi5HiZT/KFHzhUKh0cAcVa5H0j56U9Spa8qZ676rQbRgDvqoZNFQ
+HeczAGJO4gWbDmizi/XpLTzF0ZgfyzDeWz2iWzhVVHJef52zdm6AzPbnRtFxGo/+
+8PwYwPjz4UNsc8OdbwfPef9K4y/deRjbdsra/hK+H8WsVcq1g8vHDBUfQx2OKqU0
+b9ERPMNzpnxiWXZVSWcUKCr3CuSidP//z7hWU5HEgfOiH0cxYhXg9wIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzkubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSBGatPPZBVpZ+cSY8H
+fMSnWVbhYjANBgkqhkiG9w0BAQUFAAOCAQEAkscP0NZHe5qQxLYmymiLlDOoHDYH
+ackMPk0XEAUK3oLizQ3yE9/YwHUiCtXg7xvp5pzFirUq2c7KGxHS2FiarP+Pd+s1
+eTfyjoSxu9Eu78nges2OpVSC+MQFjR7jcnLVU+GLbYmN38y+E/9NG2Y1umgcO8G7
+09UeqdovmgYWO2dUBjrYNDN/+8AsO8Ly9fSRNB52EAsEiFbWCj4GTg5vRXSlKr2l
+/dCS+9rYpteuvwwFT8is94d0gxcESdr3ZtI8DviO/2s/hQp/9AhRQY8PZKc9ESXo
+DeCin/leSnPSxZcR+pWAMG1nG3SVFMbBI6uRSvx7GtU0Cd41IOTyUq+1gQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..50799cef
--- /dev/null
+++ b/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_7f7d4ee51c6c156922e4fc65630fac678bc2d764" entityID="https://nya-39.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-39.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO10TaoUu9D6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQyWhcNMjIwMjE3
+MTIxMjQyWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjQ6r63BY76qu3oy4fcswEcNsUAwN00Q
+INZ3U67sh2j346RydW48WEGTn5I2RthUcvcrnedkTBIRgiBg8oVfVaq3NT+vRpP2
+ZbLGC7q5YS4fQaXZpfOon4D6jqnFutLo6L/0MIKyAbvrNyPw4tJkZ+1IagzN60pc
+LOU7tRgFCabKqdbLxqfE7eZC6rHnnTuRaAs5TQPZRPbScCtlbYgWh5stkrXULHbW
+2LUGKcfl1Zpsk5j/FKvfPBnLOPYPQ+9P5Npjyc6ZDDQ+cpLT7hJm53dhOIRlH+AG
+3BTMyn7T9RWWvGn6N3zyA9m3X8OPAPcgcdHGA5h+i35SNeqJUAiIvQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzkubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTY7jWzgf6BnAASQS6eNsGR
+2GV/0jANBgkqhkiG9w0BAQUFAAOCAQEAQ+Lxx16hUR19sA2GA1UpNxOYEUUkZ+Ct
+Y5ReJcqDIFF1c8+PBeu6+fLNv1uFPVBoRRuYEDQd/z1MFZ08TYhBbhZtPW9eHeF4
+YB1M2wPdT8xcGQZCR+4l2di/pnAEs5HjIvk6ZHuB+MRjAVPRwdYntvrjaoLjiLrB
+ND1Un1E4WkcL3aK9VXLhuRDje0n0F2oKJXTVxCkGM0H9EdI8rqFOfjdNBI4xfSmw
+gWKpQ6+QGURDc1X8jypZjqk9TvCZSeLVYFJIHm0UwFLJX13d4SHqv8izwISCI4I9
+8dM2YmZ+4QZj9w9J457iOD6fmJ19Rs57D7ocWtLjeQ1SRkX0+3RPLQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.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-39.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.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-39.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-39.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-39.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-39.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-39.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..a39b9423
--- /dev/null
+++ b/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-39.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-39.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-39.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-39.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-39.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-39.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-39.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-39.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/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ed32fc92
--- /dev/null
+++ b/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_cad9c05a7a33dbc5d21785258959d9e259596c26" entityID="https://nya-39.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-39.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJjArZh/JXITMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ0WhcNMjIwMjE3
+MTIxMjQ0WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3R/zBO36T8LTYNtsSTkFiK4UM9WO/09H
+tR5othmBfyejrgLdki+TZOwDDrZsGuTfEmsubHFAbecz2naJHFGf/7rv+MgADxKf
+7ubEOKukrTUVqpcaAOwkQEfSPYm1QG2PNAovQ7QrA7ChppWp5Q1pPqE039byRmqV
+4F06QEr9alSLjWWQA15Q9N5wxgtqw5vApPJQuOw4OoiDVL6uw5abPJptCQsnBsCP
+ZsYeaMupSYIhFKRpebqlmZGLcGZnnQ9bJMBg6zPGiwoyGQgWL4zU403kQ0IWQzZn
+4SlL1SauhWFuTIoH+mMtl3QDrih3yhIZ92t1LyU/VmnLy3JFYqQj6wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzkubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQa7zVksD7/lrhwaeSYaMIo
+EAO19jANBgkqhkiG9w0BAQUFAAOCAQEAZ1jHAC1x2kb8W5A5UNtz5qHmD2NulsQ1
+HmQRlhur8f03k1LfnXzoGXmWCvOohmESRRo9bEMJId9IG+4HqVWxtg8Gz+R5/zvG
+AOraHGx8723WISfNeiIiEKfs6B1v8K2TpC49levT7gIDeUoLwC0MobkWkEoSHUSN
+fKbqAtWS6wdtBTJtXpORmSCkDbRWyuzmXn7844aYLmf6hMr+MkW2roQ5/hi2bHaB
+ebXWUlMNQ8JERykWC82NTJDqFyXv/kBm+wIKdQ6/yeMttKRfr3CYToK6Xra1Jg9X
+6ug5IdpdGaubBY76gxkcyXl62c6wIPLvTZ0xQSScuBw4wQp0YDVwJQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.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-39.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-39.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-39.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-39.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-39.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..50e17ea1
--- /dev/null
+++ b/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-39.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-39.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-39.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-39.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-39.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-39.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-39.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-39.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/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a1f4217e
--- /dev/null
+++ b/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_bb92f2a66c024035ecc870b17fb5f8d9dd7f4f8c" entityID="https://nya-40.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-40.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALUQAcCizerIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ4WhcNMjIwMjE3
+MTIxMjQ4WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArLEifVjXNxe1n1So0nglaFe1WRfBajfF
+YxyoDPNCKUjABlEloGYJX5xFI58JCjCdB3tL5qtSrynGMAsXH+uZZIsE6tDeu/N9
+mPgQEskDEpK9vwhZMjxjm9uB3u6wTcik0EzaY9Su+qkdydu4jgSs+jN1htBYNdoR
+iSdviVuYZdoMfY1iqG2lHoJEcPZ2rw5tmqcNC68KKCXZU6hJ0jO8Iy/sj+jZjV2D
+Uv52TBwcTF28/ehZSZh7tWNpSZek6YL8tC8qDTBF9/bV5FBs2InbLp+4jr50BVsd
+mTrmw0hqtxHcZfX6iCt8kIJcR6gKhk7Ta1/gs08HwjWA8SJSZuDISwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDAubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSF4APs2/Z27aDl4bZy
+HO7h9mgcSDANBgkqhkiG9w0BAQUFAAOCAQEATg4TgWIjDaLi3odEn5uq0t5Fo5vJ
+Qktsx2khtqebj0bMpYJXrt32V+syTmEYCcpRaCFIc/rrR7BzFaGzpTKZCcuJ9iGn
+zn/2O7Ir83FwYgzAk/H/uWstTU1kwEPln7ftkQjOpRUUNue5yicPioP4aHsfAc+p
+TrKP6iTnk5j/6/bbb6ufpK9lSF8IQZa7c3/jr+wCt64IgUw6xZsrocjFLZnlaT6V
+q/uvja1ROVq95gYP9wQBTzxL0qoHam8hkAVHtix0hThK4Z1xar5trAEoL6n/FNVk
+5esUa0cDupBnQ5i1ku0MtO5zSrix0MlhKIdLtFzeprZe0cfxaupjyeVEVg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..d5055869
--- /dev/null
+++ b/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_032624fc986ddbb11f4eb720f830319d31b9890a" entityID="https://nya-40.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-40.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOXE1rJGIXCrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ3WhcNMjIwMjE3
+MTIxMjQ3WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwkkgiOrPltNtgVVmA6EgnOPR8tfAnqSd
+dR50DXYIOara0Vwv4JUEh1BVK837osvQfSrfz/Mk78HSSY8wC4gXIwaq4M/+RgcJ
+RLxdxI2yJjleYTwFYdhldYyJYSEhw0XNSEX0FCaSnbVSI37IeUJ26jiDmntGQcf6
+fJKuSep2tEgjn2cb1NfB3DlZam/Ozta+xqebIqqwEeqDCo6l/HQ7AF31W3veoExY
+5ZEfmD6Y4OZxBFZ2JrQuBNtZQYHcwVrrRwtsr099YxfzTf5YtGDQucAdlymqXTvz
+YORWwsUOEJOoza66B2AsZ58eEn3nuTdJ0YZaZxdpzzQsExUFXRzNdQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDAubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRNBWw9d9cq1dnmWEpLvRcH
+0LeGrzANBgkqhkiG9w0BAQUFAAOCAQEAt/+hx/Qczh5MNuYLO1UvYtv/qFM2LO6z
+d197KPQZu6y2yCRy1jbiGzKvSu8zg9e3qrm4umGYw75PbgThoxorntuRLPEvxk/R
+YG1ijO7gTFeqh+JaBUrKc0fe6hBfh9zXZCCyxXDF17ZQJUNXRK1LpOgwWudZkcuc
+iC9SrpunoPWqzAtFB3Ide8WGiDTCVqJ0hJ3lRiMmdD407Clxa7qr8fUsTYHuyarW
+51FAkWbd7U5+FA5TfkAHOW/yKwbyVhsr7kWxU3u8gYiMTUrp/gfPmDK0nuR90bcz
+Nm6Gio/u8sR3+Np9/lcNdZq221jLHIzaf27PaWfZQO0yVE4/RH/0/g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.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-40.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.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-40.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-40.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-40.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-40.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-40.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..35d87210
--- /dev/null
+++ b/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-40.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-40.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-40.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-40.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-40.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-40.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-40.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-40.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/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..00e24a2c
--- /dev/null
+++ b/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_02bad8693d7abcc1d25c3d7d920d9a11a4315d40" entityID="https://nya-40.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-40.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAODcFomYSLTPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ5WhcNMjIwMjE3
+MTIxMjQ5WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwzA6u1A91BAphAM6jHimrOfEd6xbQxKs
+SFqVXOun5a5bhJPjIjw7AN5tTcJZheleRmIRcgwyT2qkSSUSDvjxSRa7pP4xOuAz
+Ndulke3BmAszJxUkvbJaMmDRS13pC/S6XjwfcM9j30eym77WY1+ibchWrJg5UMxk
+f4+uoPVRJC8ELEjU/U+wgj6ctUm/xr2t/qDekZRoc4SAGBxutGccE3tkeuFl/Ae0
+82H/xgDh8pCPnnAsL//XghX303n2gS7Zl59vbMV74nVKqNP1P/3Yw7pm4waMPObU
+F7/JRHcyOyTtIzDfyEUVDlkh8TQFD0dxRTzVenO1HBN4p+4tRGMVpQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDAubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQZ4WDCudtLR2Z0viTTew//
+NkCaATANBgkqhkiG9w0BAQUFAAOCAQEAHvTIQSXND30IDNBQ7AQxdG0x5y+kgcJU
+ZUaz87TMmP70XmRK/uH9ONsm2IngmoPi1urOF8T14rdyScSLw/FkzIsbYSICnVvC
+yBO1atn/KPnSr3ZmmEzAWZo1FNvVtMLbIMv9OSGTclqJTC9fnZFdaK0AP3fxjEVv
+HzBSSc3T9/OpTQ2ARyPqODpmkP+GOxzpPBjcLV6r8o0cqbU9fsXOHRfaXxaNUCJa
+WUGsJ1Rxrsfct7C16sfb9rvGl26cdtJXsWN+n9VHsuHbObr0zz0EdJ5GxwDany5t
+mDWz1pcSoipCbE/xT96vf388dBYIryBl2nclJCkKKCaoHbHlmvSmgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.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-40.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-40.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.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-40.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-40.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..8e336cf6
--- /dev/null
+++ b/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-40.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-40.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-40.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-40.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-40.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-40.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-40.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-40.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/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..b802b842
--- /dev/null
+++ b/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0a9f71aa1bb0cd56f3fcef0c0ded0f5dc98013a4" entityID="https://nya-41.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-41.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOIpBjzhwQOVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU3WhcNMjIwMjE3
+MTIxMjU3WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpbKSNKAEvb2JXCT66Grfp6JI8KrWnIe
+uiokewEp/8ekUVzPtmPrsshZvQC1NYXv7NziU05+gT23GFFjFUWf7t9+e1N184k0
+ckeD2oKdIwRWZ8fraKbmKRvzrK1GkG5yGqq1p4X7zZNZ7Rmeu61W2/0ch4qIGLZ6
+iZ61hc0rLYaDpL1vNUilZQ4dkAkrJEU8lKEk777eYM46dyecps8mbnTolvlBnw8/
+ijs06PaOLRxRjPCSZjAegLpybUgMiN8bMpswwSg5gR2C/78DglSCPCylkhEOLMIc
+MoG1/qHq7fS8PjBAm9P0UWx/rHs8qMTLJ5rQh9aBzAGsnG/A6grGSwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDEubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQDgwF57cQeNTBYmU5q
+97LHtRacwzANBgkqhkiG9w0BAQUFAAOCAQEADqfrN/vuj3aG9Zbcfp1FH8y+hD/K
+g/j3lMPpzhet1aQGDgxLPQRCpZAJPGlZLxQe0mdIZWoehVNdPNhfxhSoO26yiPJn
+0BYQCH13MYbY1W0vKrGHFt8lpCLJuO4BT1uBDRwg0zj+w6XAD+d9Bd8TwyUV6CWg
+/RfH3JT3R5FwE5pkQckX9Q/7RQmfKvfBTHZD5I4H5TtzEgtZtgGci8szGnIqLuLV
+s1U5MZ28HhfjDqooj4JyxY9hJrmlHlGM316/tkR+rfVWANPAr+u2Xiq/mJibt9JA
+WiqKGwij3hl7nF2KVqwcG1YM9NLhyzbrQZHeki6B707IZMNJVCZJsxlw3A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..064a990c
--- /dev/null
+++ b/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e4317ff6a49cf67a7d215b6f72675b6f9695a66c" entityID="https://nya-41.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-41.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKmisBANH3zpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU2WhcNMjIwMjE3
+MTIxMjU2WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAux8OeX+uxkSkdnhUNowovGH90pK1/JB5
+NU8bzpElz1ncp3I3v/m8Hh1Uv7FFXDCTSvbyHFQGYvJVujpmnnKjZpgSepnZP8hn
+lMiXAa8j+SML8kduXf99AYiQiUIVIgQV7xXD1yrzXFhkwTF5suTz9yFAXBv7f9rc
+rX1WYOC0TB1v3qxSvGE8fLGfmRa3nHRapemfnMu0C1gIOHZtWqdSrYw9J17bWfNA
+/zjl5yPEbh+tklvTwL6B5TtffifmqeR3KFPIb3FbxEU9573QX9l+wNsFmPK637SY
+pcuBSshvO8hmjtTqs9d+2KP7BFxZUvGAh0pfRj/WZSVSPJaYWMNf/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDEubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRBeDjyEBmPZMeFzyxXMul/
+5cd+ZjANBgkqhkiG9w0BAQUFAAOCAQEAhXNbErVau5cZ7swqVXh2ZSTUBwuJnW1v
+ZUMytBuQzAI4sdaGyD0Tj9GoiSfsmajmh1RvLEVtfjcI+2Qdl/5lP2S0jUorCREV
+3U45MSktwFn+/xlkTK+EQl49JkIbVP9HJjWg8WTtOL/pjopgl8/5yfHoPTYc7PP/
+2Vp8rWieXEwm04GtnW0lrMZb7T/YhrWjLIZiWjo6fAOivdSbOm8iwLgrKTLO/hKa
+yul6BPGFqtLSaEJW8TVABfxWiUlYAp13IR8gfHDlsz0vXxX964gJ/qJzuB0ak/kc
+F1LJsIg9iKgzjzGPmfLnrdZFMng+VTZGjaExWGWNdv6fX5X8KgtKpA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.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-41.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.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-41.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-41.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-41.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-41.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-41.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..b5f5f578
--- /dev/null
+++ b/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-41.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-41.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-41.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-41.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-41.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-41.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-41.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-41.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/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..34ff4c77
--- /dev/null
+++ b/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f93756c502c57ac11221241a3cc4056f377ded27" entityID="https://nya-41.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-41.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO+M2l8RlVsPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU4WhcNMjIwMjE3
+MTIxMjU4WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LeBGEbfnGL/AR0rliIweP/arzVBAXtf
+fjBsLEeUhv7sxgqi+u22boj6CXsZIW1vINHc0AzwqTv7/8Q+rJS79lxTvqewfgzk
+Q7Og+AItgDXHuXJMtzQEXDhuPCbzrdCT4h9n4ZD0+rraT7/NKkQzIvMYuOQF6433
+rHxI5Cs1risu06ubpqCsojdo4EaWlEoEeFE/KdBP7BpztVwVfGvyXbOIVRfzkgLg
+jmICKA/qXzIpMBa77zaK3t6NJAv5B7YwhXwLsWcxi7DRvAl8PS42JmGaDnGOGIAm
+HQrtA7vMW+4cry/IFRgcHxghdOq8pjlOIps2HeKacKDIng/zRYHtBwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDEubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQVXJYJfb4gXmHb4+go6Nbb
+zPqHGDANBgkqhkiG9w0BAQUFAAOCAQEAtrsXiIGRJRRXAWx8RCnT9eige+iK8cJ3
+rPGs6Ww4iJQ5b68LX7r+5URzXNyqe6mhdx4tBsEMsipXvzhdQY64SbKalMaPH8UW
+tG8HVayOlZqvQVKton93+fPieyfRunZQrD6+ojfpwoNH1/qzYNoc/cKtbiRChhi+
+CKi4jM4dhE2XlTYVnUEIUm4C6DYA88JrsqMKtpCUYJbrci/sLh7AJZEnr2HH76pV
+cwWToP6KKJrLiHvlGDfSHik+t4ewtg4UI0PUvvznsWpcfewxHLuclWzoHDyzVjJ0
+c/ojHalFbRTgGAzCAsVhKoB/sSFxrfNlrLyStOltoXtL0NTCukgCTg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.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-41.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-41.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-41.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-41.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-41.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..cb8d5147
--- /dev/null
+++ b/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-41.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-41.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-41.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-41.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-41.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-41.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-41.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-41.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/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..41f44627
--- /dev/null
+++ b/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d8d7745706f46d52276630540fbf8271d52a2523" entityID="https://nya-42.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-42.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAP5/8hTbsaibMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAyWhcNMjIwMjE3
+MTIxMzAyWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAva48C7gkXT7b+wZlt2K3SzUJdt3st6iq
+n4tpOYKcEmBwC7Bcd4dry0HPPmzF6e7OXw8IVMrsSnK+jN5x+sU2g/dHRmiASkKA
+pt1tJKMhgxfmGOSmVxEgxMbI0ZoeEK390tpdZrIVkw65yuH3BuUrsj55fKcIspwW
+UooeFJZ4yn31ReqldKqzXIYcpLnnx7Tko47cSmvjvogDMrxx3FL7L/gKngYwugzZ
+HW5h0GbuS/OOSD7WdQdDVB+3e8qafE13aB/GkN1EkRdGv+ef2k4nsGxXbjabOlkc
+hmTQ6BZk5ZmiMaariqTmW8OwqZKgkYNLa76o3ua9tmR0iWCcuP0idwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDIubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTyl6Cma32hnH43rLp0
+EuSWJUI8wTANBgkqhkiG9w0BAQUFAAOCAQEAFAs/QRa8EsRFhVnsUgmzkPjsWJbB
+iNUX+HxGrlF5ItycMsLSCxewO7dYsWOgbE+L7/7gplRQunCr9KoGpmSP1jt4THGc
+mkw6P2pfMpPzHd3rAR9iEPyssVDTW4T/gRM+1Lvya/406An9NLv3468/NiXoTmTi
+E6+Q6jxnEKgGw3qjmO+SvHqm4koTbJ1LVXYGtNlXuRpztfvvBNEm8ACK8orasMLT
++PTJIp2z3pqodmNpW0ocSaKlnlzFrvYXZ51UCOn4X8okZML0ERPmgGXJIN/Q1MY6
+icUA3oRXGSfcKNiVpOCzf4bzgBNfinbPeaMMgS54xjbaWdTyW0MCzNSmyg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..551345db
--- /dev/null
+++ b/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_57570c2785b399272aac317a7d62e438447bcf0f" entityID="https://nya-42.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-42.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALJAAVza4JvWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAwWhcNMjIwMjE3
+MTIxMzAwWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7LXUNSmrAfUK9WibMDjfWlS+lHUWBlC2
+u13rRsOYzprvqYToKzcDjZRaA/fNP1mYJLiXL66HOkkFabkBiqFpre3TpxTgjlvQ
+Dk0RynjBT3NH5tQtWp0VzVzvpKcD1z7qhVT3MtRcWnZ0fD/8w7DkfBvvlUr7QV++
+7Qv4ygq7KLsQ/HA6hcnoBsbs3JS8MnjamfL8qKcmdgurTvqH1pzY/kmTsNrgP9nu
+R6BBeHmkZ5wVtOqOLVKn3AiEeXmGZNZoDi7HkSz5ya4g72Ph/R15qMectXP8fSnW
+3wC1Nav6rORpaW2XxuG25cRKhwQ2ow494w/ZjHvpboWIPq1kJGPrCQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDIubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQ3BXsHVkqTp0DnZqU35sdJ
+kE61FzANBgkqhkiG9w0BAQUFAAOCAQEAWZ6jr/PECvjCUhUgUyg82JHv8LRLfQl6
+Xo5VJuZJ3MZ8p93EGoJ14G58aSPw6atd/dj14Fw7YY13h7UBMiVyeuAjkrvPnTA0
+lTHrKo/We4TeCVcSZtOiSl71dRl1eySPp/3kaefguSMh0gLPdjW+XD/Zz+m0+aBd
+adGnND86YRlrCD0YyXW69TQz5Pp7dBnln79TQOicjR05MSelUHUSQIdCEy83AmLk
+kASYopu1YC42QWEkkbBmokuwMffcdcFncxoxGzzDp85c3JeIjpe5FdSpBO/BKUMW
+/rF5NCfzyiQFzzZkB/906LMjYIfJGBafuVx4VQo/8fQ4KQyTOa3N2A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.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-42.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.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-42.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-42.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-42.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-42.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-42.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..269bda85
--- /dev/null
+++ b/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-42.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-42.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-42.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-42.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-42.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-42.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-42.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-42.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/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..3fa32a26
--- /dev/null
+++ b/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a5333bdba128b9079fb8a3ae57aa6a6bc31a2f54" entityID="https://nya-42.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-42.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL0yZvtbKPdFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAzWhcNMjIwMjE3
+MTIxMzAzWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Oc5n5glf5l0pn6+8L2lU4roeQoS55Pr
+5VkI1SYktGX0JcYk9kZiPoHQla3gzgipgAlD6t1NK0DPL2FEqzf7GdKA720f1D6D
+zvSa1PWQbk1u9pSIamt55+XqLibx+4dXbkU+S6knOV44xYf6mQM3EP2gYiM5Tbxr
+KHOsmJoZY7ge3GDbL8WDq+UCSUA4uKJ20/ryXyj0m7QJxBftutyxa+JYwnSvlwSI
+WUTvnew97ArHrmn5Pxwz7WP0i6gm95Sd2u4hXi4Ifsli0QdupkR5bQRA+wt90XZm
+vGsgmOgja9xPjLAiN/SytLHgByfATtevY8IVJRHdL7R1EslbWSp3twIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDIubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSP8mYjkd0hYbfUTQGbRF2U
+uA638zANBgkqhkiG9w0BAQUFAAOCAQEANx3RcwO4nu0TRK++j7nh1OVrLRXp43W3
+W8+Jajp1USLB+URP5qvZE7LEve7cKlgnUXtNHEwa0ShQpegOzMpD4XCNMctobncT
+jgk4PBFQYRpgxI0rNfsPAi3AbDZaJhlYyOh1Nxiqji+/XGh6Ne5RPbxlmDtsMHvY
+s0drFosO/9jBOlAbRMJpJg/rvL3votGZFKRmbA11u8jj4giCRaIhmGJ0vPZeOw37
+vNHjiDrZYd/koyPChOjixDPgW1nXYa2mZ8hEGkE7+WyVMrVLzHgtglwGCaigv7ZI
+oHr4fMXOHMsL8OyM/RrqMW5mc8IOCAQvPNTBrHFndXCxbbeXtqOGww==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.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-42.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-42.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-42.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-42.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-42.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..179805b9
--- /dev/null
+++ b/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-42.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-42.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-42.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-42.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-42.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-42.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-42.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-42.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/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..ead5f731
--- /dev/null
+++ b/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a3ffce3007befd583e06f198d8778e438e51e193" entityID="https://nya-43.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-43.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO4d7zmYFGiZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzEzWhcNMjIwMjE3
+MTIxMzEzWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq78hlN+wMpRcpiwHtwQml1l6R6JCeyVE
+gBtPN66KQINDLDrLyhfAchpX2gDT4Hvnp/m7gje330wj+qZli2enIJg68rIFggo8
+2JBZRskqCbEnCgWfRQCOI3GhH0VWfMSZX3HrQVzfhfcWGEfmgMZbrrW7ezBBYHnf
+3PMmWXz/O2d/osuxwzVqIYmsQvcV6zyZtwGDXhBQg5aL+afRD1uyWyvnPhzVlGNk
+VCrl+49AKVPKWcftbnV2U7G4PVBGSJ7dgox5JSfkOn4fnyBwmNwE5Yu7XoCJuM6M
+WBK3YCYKAQ43ZICW7qPoumZ69N8JafKi/5ZW9q7XOQjWTxj6fPRkgwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDMubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTVzkkxulCUwsbRDRkA
+HUZAK7UPITANBgkqhkiG9w0BAQUFAAOCAQEAV34JXTqXQ+Kv43+NctF7OFlI0NB5
+G87tqjO+emOEk06BjtfoHxWj+Avx3lNwqBehu26atF168HMDGXSkfxk+GIWFc7Nh
+/yBLatwr2xy5jRs31myM0OqoUfQMZNRCcQE91DjSNGy3VklW9vBOK0aG69QrX5x/
+cVHQsh1GbU5t3SGEmvZVvvX6qUAPjo9F8AKB5TKavB27Y4VY7SxWO+ENj/HumfwV
+c597AGS4H2xOXmmI9qDYinzxicaV8axaHWT4YsU4KJSsWhJ6GohJSAFluB1sWbfX
+Qk4TWq1KXxxg0O/3jwNuOIN/UiOJhstNsOT8zEBsPAdGsrcsM4j1+kSEWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a5c7423c
--- /dev/null
+++ b/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a47c428330ec10a63a5eb9a704c3ccd6381a556d" entityID="https://nya-43.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-43.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrQdtJZooR6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzExWhcNMjIwMjE3
+MTIxMzExWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxlrsn+V+5HB/+FxZyokkiC2eEy6U9cn
+PCSRjn/MdG4dEyCkT8qqY5EGuwkI4pMf1HW6Jy4xoD+cKcckIHLcPRtV/bIgXqHS
+OPwVYTmdwSjlED6QSrwR65FBr4VfoYzPgelR7JnPeRKavXoSVNzZLhSkEYgBzHMr
+is6ffwP9hS5BIySkIC9bsjoiAkpY7hoBmZvymfnc8vyseMqv5zLch+pgd++AaFOj
+Wjbwf/exxwqAd1hxtJLoVEjH1FMQz1p7tgpkTRRe0L8p0UyXnEeI4zoDlKbBroQD
+Oku3H02EAn5YQGybWYecQsxF9KHcnDgTkNkghIZG0i1jVv+a0S9TTwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDMubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS79A1N0Cqde6qV0IYiFZrm
+VG8vtzANBgkqhkiG9w0BAQUFAAOCAQEAi3MGPMt21P46I6u7T9+fD0Rf0kmoxnDS
+F3vFhtQXSGqX6T7fPX5lRojoA11w71kYK/LEzyDNjx3vAwp92tycoDQj1hAO6AkV
+W9XKNG5vcrkh5RPY9/PBUGrZnCwju2JLCRmVuhMkVMzZs/O471DV0EWT+l4Y+sl7
+0gMEooINBV4dkXxzc/uPDsJCf1Io5lluipGN6j7l1v5VN67pxVuGaL1N9XlfWmF6
+OQ5FOXvsd1zkvM52OCxIdF9VHHY6Z/SbBYtvK6w/gpNl1JR1qgzIRQA2VaJZiUnn
+zNDBdRUT+W98qJsXKqTDiHE3ocuYXcy++jEb0Vh0rpMS3VcDXkhEpA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.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-43.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.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-43.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-43.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-43.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-43.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-43.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..cd4cd4e5
--- /dev/null
+++ b/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-43.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-43.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-43.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-43.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-43.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-43.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-43.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-43.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/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..e04b725f
--- /dev/null
+++ b/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_99e311239f22f6babdc658b46257a5e64a85517f" entityID="https://nya-43.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-43.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK9d6g2UVDfYMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE0WhcNMjIwMjE3
+MTIxMzE0WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAykbelaWvwyFW2CyEZH7e7QZCAJG/VLdv
+ivF5jjzT48eMMR9DKFjIgpZrnHsRdZZr9zkzd9HVl9PhRQiq4besjN4Ygl8L3Cky
+CGu1zb5vWl/CpZkRsnRVfBsmxEvNgzN1I8dZ6gzp8joVTBcla0TWov1v6Rz9mKvk
+SZ+4iUeFeUyXdA6+U31VypPlo7NV2AG+eWGtvs9zVMZFM515pww7HFVISKV/xIMa
+uMnaqVq2jBk2d+BozsxYsDQRhR/Xjpaye4IhikO/SgxTVNvZtrWnv+ZDubhMZnVq
+UIXijMbaoQmHGT9NAqBZe5nlIHC6cWcnAVrJq0Bd1w5dMImFnpQW2QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDMubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRc2Y+V8Y+M37rOuvpkB8US
+kUUjQzANBgkqhkiG9w0BAQUFAAOCAQEAK1YSL9JBU5ooZhk/w4A1HLyxVrFKmetF
+4Wj3LIMxu/7u0wlq+KiBHh/hSldixg0UstQ//koBeJ1IrXq8U0bbIruETm8HfiAa
+KxqIhpF95Mxa3Q+33cX3ksJIoNLGZbkz2AR0FpahVZFzwYnEUSRres4hMb8hRiU5
+CIk4u0/r1AtBTjhNcVExwtYyMZ03LRpIFxMn98IYphsP6BzjPem9/b18+XaLvnki
+X811ZEKFXoeiSvbKSZjWlQ2Eob+X8zjv5jPD5iYqgkGPh4zHbOLAOGja2wqFQApm
+9+uWyD7kv8f6iruYY45PmI6cbG02W52yHRZhN9k11fRRlOTPqJCyxQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.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-43.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-43.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-43.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-43.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-43.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..1c0dd5c7
--- /dev/null
+++ b/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-43.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-43.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-43.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-43.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-43.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-43.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-43.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-43.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/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..d1588da6
--- /dev/null
+++ b/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ac0d31291ee20b449662ebaac0c9a9a2a94840a0" entityID="https://nya-44.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-44.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKf9jb7zQwXrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE4WhcNMjIwMjE3
+MTIxMzE4WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAygrMuMIMN0GSRsQmTmQ2pyFWpHSDTMAH
+trGhZZNxz+KyDaLL5+BIuu5wY4jGoPuCJeu4CReog4mOEm/O9Qsiv295PvPk+o2n
+966gNpttApjw7d8+yafs02c3z5lkOpysP7olODDkQd+sRzd6tbZcTX+IzkdVDzXa
+Hjs+GNHvItvucAIWW9CRXPIxff3IA3C9kvtL4YcxXVhd1dwUV9kOuhw1oXlnpXjE
+aM1NJA3laCpA4ipQQfrCu9f0dtNZGKzmsthQH6O3kzTpGFrQjojh3J6pvFnxQ/UY
+rNitjABBCm3rZtDS6jfHAOUTrj4Pmv96Rh3IlJwZgTW7pEzSNG9+swIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDQubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQ5coLlijaoaxxkjcOH
+h2Y5z+4gWzANBgkqhkiG9w0BAQUFAAOCAQEAEsQnqfuhXD39wSvubErCLDYR3dyh
+hK97728Ox7AMijpp0f7CntjnkjzyyFzGJsBPmJsE4g11fZotnL0xwitvWFG7dGbE
+jEshYXEbp2RPh/XH4lAdOpVyiHw4dWo5EePVL9RDbI+NalX6CWdZN6ochz0nJX9f
+nB/kDwpzgeNGDGCOOpMMoRMr55P3pBMJJA4RBqN0cLqr/YU60Z/+nBU68XIo+/2h
+wO9uEbB7j6r4dXxtLb4tan/8PFJHeaa8Dx3E0iaMYl3Qq+XKyYK7tUTU2QoPA1Bx
+aelVb0hk4jhW0bdZYAr/CHx9Cz6CYCNOrToU2ugV0clcsYsMhxsMxCqX0A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..229efda1
--- /dev/null
+++ b/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3fbabf7c5d15514081a2606cd95efb8c3cefa8d3" entityID="https://nya-44.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-44.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/BdVBxTmtfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE3WhcNMjIwMjE3
+MTIxMzE3WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxKpXC+2COQ9atnvMPazMLOq3a6NDJy53
+2jxAE5gM2nRXUbSnQCSZoAAjS8hAjOJZqVjk6eoqfDUJIaOTsLkKRDgVFOzBZI2q
+fQcyzA8ZA877Y15vCbVgkuu2HXCnxN0BvIYL35rSSWFtPH1C/cZZsYVwtT80bYUK
+6bV/3q4OiaOlhkYyHrCyXTpbGiCQzq5zEr3wMJ/QBRTf93wZN63Ah3yjySKDn1qy
+rb4qHneGZ34uNbPc6Y3YQ6FsE33l6WHOSoiWIU6pgMFjUzubBbmvWWOHKdFGydgq
+Pd3RmjRYV89vit/2A6VL+Vb9rsv8HFIjrfvFZsTPQ94juYm0j6YBXQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDQubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS9Bw7fP8+3T1mgZx0T3a86
+vrR9dDANBgkqhkiG9w0BAQUFAAOCAQEATrQffgtNdmyuthxkI63JhrjpaC073QmO
+Vsr8eoINWql2zWYoqSo8Cjl/Wv7g5l5Pj/O6bI0UIDdYz3TFPPfbXMKZGT4V+dxY
+vXeMKvyNMBXQVNfr0PyInZZjKzNtAMsCL50dpJ3B7ucR1iIzJRBZIJo4IdA1tKUf
+7QQPWwEWBELBMeGjT6O8dEQEGI9sTT6UCtXWdEzuJ1an2HK8BjGHsdE2D03pYs6r
+/RinoOcCCmMeCj2bk8RNaMDMEc3d81UQgzfZT+anWYxjk15uddmAVYiFjA981ZLM
+5j7g9hv4Cows7qPjlPVvJdbtFsugApbEgfMsH/D7JcO7nS8rAIAF2g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.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-44.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.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-44.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-44.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-44.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-44.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-44.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..953ac351
--- /dev/null
+++ b/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-44.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-44.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-44.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-44.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-44.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-44.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-44.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-44.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/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..a011c093
--- /dev/null
+++ b/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a0778da8296232a611d5938e506041b72b5b262e" entityID="https://nya-44.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-44.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2CquHOT0nXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE5WhcNMjIwMjE3
+MTIxMzE5WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoCd3+9vAgk/wKkMt+6EwpJwqrKrAl99v
+97KfqrL8ixP3gCC/nQeyUyWUm1SJXJdnrE8CSn2sLJ0Kdo5zvcp6Kp/nYmn4eQaj
+rB+szq7qcuZtvCJIQ3RhFcH+1qTpWc4380Oa547XY/NofyDjJpJk2cI7dBaZjjVA
+euduG/ggDN9g4KrsR7gVp1p2GyfTpmHSOf4J0iRB7VzdSYSzJ07vZmhElbPdLfX/
+b4G/fA+ttWjnK99KAr5Sh3cJ8z1AJd73g6apeghfK3aqCZfTYrZPPbrTfG5gO6DK
+Xcar2svO7nd2j/2jgH4jcNz6sm/zyIHH5FPBDngjqmwfPRrDSU72JQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDQubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT5i3F4ePmS+GvYn9KcWwHN
+05FBYjANBgkqhkiG9w0BAQUFAAOCAQEATXYY9DoBUhcew39vCTu0n5/Py7GSMM3p
+Cn1FD4nMfzeaizdyc0T93Kd/QzhmYMsSick6ZYkqRfHH6gvGR5d78qcbfH/YnM0F
+d/KGgTLt0gDAKKZJzQejX4Xql6pyTEANwwDa01HSrICLpnJTQF6hpefheOM1LRfe
+efeVq/GdkjdLFCUbWOCYRfDpz1O9Js947gqB1BMHMKuDyVgLcxWXTbSdPp6IhGRw
+f9xV3QjPxdxwS7ldOlrrPgW53ggvndcmJyleQzZa7/p42fYMKbnQgRV3cCw4LQob
+gk/xy7OaTwrFd1Arkk6GcLXD60PP6qkSpUKy/YKDvRv52fqkxFw1AQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.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-44.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-44.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-44.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-44.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-44.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c3d50c98
--- /dev/null
+++ b/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-44.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-44.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-44.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-44.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-44.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-44.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-44.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-44.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/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..fdcc3758
--- /dev/null
+++ b/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f35781a7340a9c324f0e0ea983ccff0edb7e8752" entityID="https://nya-45.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-45.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPCOJtfRECX1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI0WhcNMjIwMjE3
+MTIxMzI0WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoY+2rIyqwhFT1gjsiiARLRHKwy4J5wMP
+i99Tom+O/z3/5zstYTBNkY0DiWePIwPWSNbyj6UKle5wr1FQ5eHOrd3eMXB0bVLZ
+ovZeQgInaNq2Cw9XJjsK2IiJ2tVyj0ET+O6gKiuyXrWhlRTfThiYJ9FGAoBF+rgb
+ogvDcVHHCeK2dBgvvXXS716j7jgJWVesa6ziIj4GJnWSC7uZcpHFExpMhwUWw5Rp
+PCJBcsO7i3BFTaZ1ObzNa4742hzf1axC7+i5ag3mm3auH0ixVyEjleQXns1eYNRV
+cMlv6VcKw3B+Yj4P0ZN+qWX5uN6UIrIxK9A0Gm1cTfPnVcCQkJb6wQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDUubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSFUnuZimfuqlwyI1si
+bq+Ojnz65jANBgkqhkiG9w0BAQUFAAOCAQEAoRpwCMIcnoGT9XoR/T/w6vlnKPoz
+mqd7Ea5sSCF00o4Zx8PX3l6XU5y06wvsQA1hBrLRd2zj36OiL5LXEnXxwLUL1eOb
+tMUBfnDsUB61o9MDUOTQz5m10x0LLsBCAQJ4cQZpROHlWqI6Fa0CL3Xxj6EqYzra
+Dd+13YCElkapvUtki/n5L/slZAMRg7aY97rLqlaSSoHt4HKACud0TMByvfPDjaJE
+lz04d87sl4mLiB0O9/OpmS/Qpmmw8altKwphGt0Abrh5Lnb3L1yD+7AOgvSvOPxl
+hLfWHWKd91WRCQK8H/VL+DOgKp0NaRyOp4/0SIR2xMmWuBJWNSJB7lO23Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..24e295ae
--- /dev/null
+++ b/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_db5f1dc619a07b1965ab961354b12f61fc9944b5" entityID="https://nya-45.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-45.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOEOFKFMti6mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIzWhcNMjIwMjE3
+MTIxMzIzWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0usNdXvuOr+e2cX/pK1Oy+QBt7VtmqSL
+qQ5HvX0EokIwh+0QDxxcawsz1J8GMwdqzobBWyiH8mXLt0+i1zJETb1JUsY0lPZt
+55fZEkEjFySdlMtNHn/zl7p4pkpvwL5/zr8GzYddeyvtCSileAhoNPVm4TTa+BSw
+NB4HFX/NjNL2oyp7KuvsMXZfCAanhRsyRQ3FEgbB8WQ8qgxAn0GkxpRlSLFIgfbY
+5zrKz7sZpjCpMr+vzTU6xqXNJKH2RTEs+POYmKXUzTae986Jccv5njcBlcnGbbQw
+wlPOZlfUXvxCz90LLH2dhYum4zaz1Na9SAK9BqZPCwSRW2vudiEiywIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDUubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSJs4tkR9Wo836ZFHB4LaSZ
+j5pdMDANBgkqhkiG9w0BAQUFAAOCAQEAyBN/Kq63vBr/zYcKgyBQLrsWwyUshbGP
+NKxaMYCoSh+vjJkLmCpv6RceETApJu6gueQ+pAvoiqeKdJBKhN6mQXAtAbgV8Qvz
+3MPdym8x+Ym20zrQjVCOWZRibF7WPGqBzd0G3dgU7+31Ebvaa74M/HoJ2FebtLaQ
+6N8fQkVWMPWY3ceHQaqK0/tzTZdoJ81qg+YRQONJ7uM3/qM3Q/90iIKVqED02K37
+1Fb0I1nLS0KXKqqI+2TNojFUdU+ZCFCVJJksqTBBhHZ4aQ5a/PQQCoVjSXHEImCh
+lnsmoWPkGb3xFK4yyL58Jhv5tEJ0B4b/6whBdbLl8SW4rlCIaJQ0pg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.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-45.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.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-45.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-45.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-45.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-45.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-45.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..b9ea0dd6
--- /dev/null
+++ b/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-45.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-45.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-45.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-45.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-45.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-45.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-45.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-45.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/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..8a9f6d74
--- /dev/null
+++ b/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_90c989509380beef516e4ee252c94c0112001c52" entityID="https://nya-45.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-45.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK226Z3IqEFFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI1WhcNMjIwMjE3
+MTIxMzI1WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu/PWlfw5lmcUNgVyPN9dVHE08Xyh0mdY
+FWtsrJHn3/iWDmxtOG0v5rqR2NnhQtJ0351TyxBRS8t4BnTV+FAWwHNND9XPkLMu
+zbCuLw6qX9DjmnUzrwVFVaXsV7MkxThow9UTrArM2sgPt1F3Si8JegLWYsabuGkD
+huaAgH1Brz9AzeUS1CLgnh+BM6NfGZu/QS9+tO7yRzFD/YIJ90GlRqUHcmQUrQa+
+5PhllS2mxHEtvu1ehXbeGaNbUU50BCt3PQvbsniep7kIhlEMyFByDCp+6HNpQIcz
+msAcLJ7LehDn36lWBV0POlDNNt2cZuOkR8Hu9E8TZT4Agy+e9vXQ5QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDUubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiXv/QncX57hTz0+ZECNxd
+TKLmPjANBgkqhkiG9w0BAQUFAAOCAQEAeEXvQE6FqF6Hj8NgdoGZa22ptaQiZCQe
+zbatVgbosc6Qi0+HGtGOF4OT/JEvJ4Rw2Rzx9kzIlQteM+9RskPLr0Bz8M3PyGNG
+SmD8Cj86FrjfPM3QFLqtzS2tEs3L1hocgLvs/Red2HmMkUlrBhDSxf6d/jtwtg0A
+N5gHjRJZt4C2eDPTH5zqs+9gMi5MOGRqXP+yMIJDI0pTNXYnffYL3rwXHX2EgOpA
+Grxp3KVv2oUFE+xa7MU9hkRO9sT00gQkiyJaOBw31mUPPkncGA9fsUa/z4ODnpqn
+4VBr1tDzl2fg6a8/92hXiVr1akaossqdqe5tzR+6/MQDfCbTtM/gsQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.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-45.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-45.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-45.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-45.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-45.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..e5754ce4
--- /dev/null
+++ b/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-45.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-45.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-45.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-45.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-45.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-45.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-45.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-45.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/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..01bddd6b
--- /dev/null
+++ b/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_51d3cda955b0390e65d7d646f7c884c7ba3c7678" entityID="https://nya-46.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-46.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPU7nWJ1NeJyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMwWhcNMjIwMjE3
+MTIxMzMwWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA45/+cWUpCc7M4MXvjcFSF4Re5rT729Bz
+Yovyyz75bO2UZENdYscbtPfAEHyIBD2HUE4NwGOy4IS7UsiqvjHheMsAwqJDJb7Z
+zQskT5KcvkCt1VRdFAcik3qrNEj8rxfIdUpR5gYAQo3N05Vfpi5kqBi8aBGe+kJ1
+ZPuKDtpOXkYG4uQdsdeFs9LpM8knsnwnA9PYb9uPUPSvW1ljUsaT7X+AcWLSJ45A
+O5t6rVD+I7/QclgymI/SqJV9VsnmWikN2hXOnI/URVqpenK+B/PupbjXXudjElmz
+9biH2astqKDrCAiT/l8k8Bc3tgf58XFMQbbVvBxp6svsaBeCBBkvNwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDYubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSqx8j6/pN2A7Goi/TE
+kBdM8PcVmjANBgkqhkiG9w0BAQUFAAOCAQEAkkrLDNy9abNxi18EqQeOi4nCjZ9k
+DQ9sBVzGjYZj7D3Vh6o32wD8NGgpyWRLiCO2wLRRFno1d0pNBVqF4eoXCJRT8Li9
+5KyH1R7XppN7mzWfwgS462RQjDSWZpzzodSPzGyg+yT4vu53RxswL+IzykupeOco
+Mt8kbglrJ7ghPUVQUDyCrz+FxOR8NYRASNHtXXjNaSbdNVmax9rHCJ+Yu+K2q3BX
+v8UaZ9Dp5IXg/og1Fosd+aZelwoHO3qbYGZl+aU9HHls5xBVnzj6sJ9VETUEzSZ9
++QJNOeTwm2HoZXN/0LdDTLMb7h0WGn+/iRhXwLxs/+0jUYnzTeDQ2HiHTw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..68e4888f
--- /dev/null
+++ b/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_62e5255ca4d93b24819ba34195861a2ad7a4eafc" entityID="https://nya-46.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-46.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIw6OVPU8U/AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI5WhcNMjIwMjE3
+MTIxMzI5WjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDgm+TEdxNeAQpxPILznsRVPthmmzo6A
+yI5+McpoZDxEir0BY0g2LNVP7YNPGpj7Gu0sah0VH5aNLb/iCyrg+q50iBhoebl0
+ryaLN1vviJP1d0gBemLSg4zhCzIBVfaaM9SMJQKTG29aT4ONT2rayL34eIocClcw
+sAIDz9H1jKDeZ5uFDbRFC7aIb1FiBrZkddCfj9lEA70G/TxgLZbrUKWAWI8ntsut
+3wciftJ7YUt7WnzlcyYr6GtiIsisOXk7trKtOBywbJeUNmbkDXTVsxpA8kWqPah/
+PZUrKFqgBhsQh73BXK1xSZtXzvb61ZyCQSoEk9sg9510MSZ7cxwrewIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDYubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSJ3zgXwb6P+luTkK0P7Etm
+Lq7vfjANBgkqhkiG9w0BAQUFAAOCAQEAVtrj1RV2Ly13FVZeQGBtO2/cUKXldN0x
+mIfIzONoVzr9iWdQFtfRK4DG0OKihswB3ThqpMc6NaDBAGU5XPr2VGeDnVgs86pe
+bsYT/mmefVJiXLirkKE1BvdJP5nieS5Z/H9dG5iqA3fvBrFY1XJ0f0XHsjoI5BO5
+fb10jyKgF0YCIYsF5nmOW/ePO25bZJuw3BKXF2fnI38CGTEJyCSi/bxH+rUbdlkz
+yGyDih64vY31UtR5Fg5CltgXw10p5hvMBZIwgVsbSk+WhgJUCTre8sfxKLHrPj5U
+pfhKki7x3ATaNm86Fq5K61gZLxXksKUmnY045ltykQd0QfGu3etpKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.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-46.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.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-46.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-46.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-46.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-46.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-46.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..e99650dd
--- /dev/null
+++ b/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-46.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-46.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-46.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-46.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-46.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-46.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-46.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-46.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/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ef60c492
--- /dev/null
+++ b/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f06e2f6c42bd8794b06ef7dbd9291733201a689a" entityID="https://nya-46.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-46.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAI+ekpDl2R4qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMxWhcNMjIwMjE3
+MTIxMzMxWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAojIqqEgyjq3R+WLLKVELsR78EpPiE7T2
+d61yK86781VpWa57eJQhpcncYW5svCuCprgVNEgVSuvCd5Y71gR/F4J7J3ldm/kG
+lpYqftTLy+ZAltTsuR8MaLS7/zgqUx0icpf3cABDABlrn4hgCjnHMYRKAq7H2b16
+U7TzAQ4gPn6N2/+oFQFE8e4uq/YDPyG1NHxFnVUreEnM4DGK4C4Xd+MVr5Jvow/J
++pWEYlqAG+5rmmw2MWp4GdoGXOSPsfcue2ckqZ2pmm3agXzL6/umDuAKsKObId7U
+58SHFW4AMoiazN1xbqFPlFtSfMBfzHJyEoBWJYYqes2rGb7GUvn6EwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDYubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT88evnF+7qGf56PidClhox
+jFI0VTANBgkqhkiG9w0BAQUFAAOCAQEALZf1xuErtAgcppJ4/nJyFs2vFDKzTDKg
+3xdvQPGzSlmohyKcEKQgVUm7m7ez8raX9Lptri1zHi8pjFoG2k6vxAp9oeppnXJp
+QiQtshBoHJLY2yigQD8yUXJiN0mW0DQ3IXu6iPh6USEQwlysBQiM4xWEwF0u7Ao/
+bOoKJ9IIU0F0+c2i1qABLSTiKR6So1wktAXPQzz0qwXgHqtxpaoxseu1vGcRnFTV
+MFo1U5bkNceX2B20YKvo2nnL2sVx6jcnIIacQM42M8pfRMxk8L1qTd+DilrMO0ah
+e6mLkRjJrQyNp3oDfgGtEOZCT0glnLE/UEDSdyR8BxCq7cqJcPn/DQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.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-46.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-46.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-46.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-46.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-46.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..7663e1da
--- /dev/null
+++ b/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-46.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-46.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-46.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-46.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-46.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-46.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-46.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-46.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/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..450f3ca4
--- /dev/null
+++ b/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_83a429c87fbf33734305371683a946c769e1ba3d" entityID="https://nya-47.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-47.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAIKGJs6KE1EbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzM4WhcNMjIwMjE3
+MTIxMzM4WjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDUCakgjPKnrwt1wANDLeSm85uxOuuaq
+bZ2oIQ3MrMBjDSEuLOGf8ssJYl+R47XkN8lrOuY7XVzhhOrn5rv4V4QT/pDeq+wT
+5QMlN+7qekpk9x0j42S7YmnWxkcvgbTgspl/wewD04HXBHgyfLiS/xBA8KHPx2e5
+/05+vOZcl3U4zmGmGeilzBJM4GJx8h2LvkRFZGMxxj+eLjilrwobIxaylTWxdTNv
+W93z4UFohWKPD1F7SQVeVZLy+p82oxat5AoY71r6F3gjSc0w9/fVOBuh6aK5IFna
+xP6FWt7dzg2Sy0+41Wl+gHVeP0CpBSVqTL69XOA3C8NFjXJgXnijjwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDcubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTX2lhspR2CE6z85M5P
+KHcR06RjejANBgkqhkiG9w0BAQUFAAOCAQEAErzTTOyVJHlDIHSgwucYrfLetRIw
+ZWstNkCK3b6Wtyg02WfHT4X5RmvNGdEAJF3JsIb1G0NQ8Iabt8ha9FEMHiYbJwDm
+7rQ9e4/QR2p+h9qympDnf5f/F4XB09uvE2PEXwjKUgGAilZUHXYUR/EwPiEb9yvt
+D22Pi7lLVJ4RwNzW5XfQ4toOabIl0Da2PEz+8+4HRKN58NAJ6rYWYe2tWUUev8iQ
+VTDLZMt5xXcZ53wPenW0YGYvGIGP5wkCghRVzvanS8s0radMbd9tBi0QdBc+Q8TA
+I2/OAhnrp/0L0n3N/m7ywJxCBKFwpq8GJHfapLKEavPl/nf1bh29PRuxTg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a2962c7e
--- /dev/null
+++ b/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_388548ebcfe7e832170f964069b55d8b5f9d73a8" entityID="https://nya-47.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-47.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKcEInslZcO1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzM3WhcNMjIwMjE3
+MTIxMzM3WjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsAqG0LEHMuN2vDriZ9lLf8seOXlfkIZe
+WEMWvSmlFW2X9xYxIv9ra5x5YkOuD+O34Fzhe/Z8CipLVDi/rELYvbL/CXhn8Omf
+rw4VovjQ6c/UukFp+ALwfkrxusvrJiPQPC61TSK22UnnmzX8wmsD+l/I01j2CD7L
+4zNyPwzunyzSGkdtm7j64tQ09kW1ElSySxbYgpV/5tk2NDdoOe75sCWl/Dd9nLNv
+hLtKrNJ+QV453rAtxUW8BKohm58eb5+CDdINMZcNr7svcRZUiETY/BsWCyQAlB2f
+nERoiAfLeGufMg94BEbtDjBZpUQtwHqenN5BKvAIs81eWVUMM/lKbwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDcubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTC2zaQrpwHNrb6nPFbj/tv
+6MJyFDANBgkqhkiG9w0BAQUFAAOCAQEAKIB79z74TEvvXboCzQrs7orbgriIqvbJ
+d/uN/DafPVIlB/WVloS2zwVz43FrwiRT5GidrF6uVLx6BBKv6STJhzPoZxW47TmE
+40rUwLAUMbZowmy/bzhrPbM9GpMlBELFbgaMZK3RbWcqgij/yIvnJh8MsA1BMaAy
+Gg+ZBpFKPjb0jYXrrNdpSfVRziSL++qCK0dh0Hv4P8e6UyhNw1zzg4KH6f8ma0jI
+tllspDpmqg61xQdS8Mb2phZzhDzYqJFitNOPnHmA3R72qskjOIq4VazEOtAddb+5
+c9CXZ8Aa7kzLHFfet0Cn308DR7TW7whq7j/Em1ehhCrHAu0kcfOfjA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.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-47.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.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-47.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-47.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-47.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-47.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-47.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..3c0e4afc
--- /dev/null
+++ b/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-47.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-47.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-47.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-47.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-47.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-47.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-47.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-47.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/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..81059933
--- /dev/null
+++ b/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a5f1092307a9a1feb1e8bbb73ba04f77dfef7a72" entityID="https://nya-47.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-47.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKn4WsixpLnkMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQwWhcNMjIwMjE3
+MTIxMzQwWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAviceY07ek+oWzykreeIfx5mfxEZPUMR8
+4lhi8C7UzTlRYXZ7BWVCNFeTKirNWpp0oFSfgjrDFgD1a8Fh2tYjuEz7GGq6pcQx
+wm16gDI42EU9NlJIEak05HkDp+D7yx7ZrTE+c8qyftzGLY4dwAKpvVvHJSt+ebNN
+P4+T1tkqpkzPefEVUSi1edZmiOSxEIQ4rEzkBf7s/uPKQ6NDbTM8DR5LARe5Bfem
+YEPOLFjkruhutjUISNZI4vpxAYIN/k/gcFsMAj/DC9A2O+eXZXETYIdcneqt7seq
+Kkhud0CgYWeT1cJVhut99IAcrCdzgquXlcwnht9m6rbGu+B8V77fMQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDcubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSXos6kOaP+K78hw9O2Nycn
+Z9G1NTANBgkqhkiG9w0BAQUFAAOCAQEAVvD1feEFIjLi6rx3IAP5H7X3uS0inHNM
+Ss8sbMyoEwP6SCbc1bLhowuUeetfYOtfDbV5hd5Perfmj5xfuUG9ErX9cNY5vsbO
+PWfoSRPHgxD1Mq2io9I+iUKP0ebAqPYCbkpnstw9SV33j0Z3mffAdKnGNHjZZawE
+sBOUcdhX6MhG1ee3FmRjEuwC6ISvrd97j0L3IHBXULbMpgRbYTiAUzW+KjyRuklc
+UyrPWWG/No1JuKCk1IGrKV1UVSbtwld5QIQpm62vbkusz17W9GnV686fyFY5dbsN
+W1uPnkV9H3icc1ogBJM9aqATomWj6mkqORkYqtkEBY2KlHcFxL9NrA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.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-47.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-47.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-47.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-47.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-47.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..b7c1e7b5
--- /dev/null
+++ b/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-47.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-47.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-47.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-47.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-47.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-47.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-47.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-47.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/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..fbc0d7ff
--- /dev/null
+++ b/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_07e84dce0f0bb4a0f9c269f6a57defe9519a5abd" entityID="https://nya-48.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-48.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKqMDl9k8exfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ3WhcNMjIwMjE3
+MTIxMzQ3WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3sEZxNqp5b8LIKWuxz4Tm8gc4WSvh8va
+d+uY27pWwZThUYPPVcghjx1PknTiu0Guk/hx0R6au49ISk2OPkn50zQZz3ZTEmfq
+QYuqsRFWqEIhPQh5pMp41pW5l93p3iQ4UxDd3MVYYut3+XOrM5V+E4ITE32hWSj7
+zGNlEAwY3/z4perUrHrlBURtPe2VPtJRgrWHUU1zZTyZj9JXKFTovYnoND30IW+l
+ypgHYd2nIEkg0ipnggBT5eAbWCfRHh6Hn0x6HwKjxvciGmRP/yQ0+A1iB+p7gKjo
+Ht+Rh+4Nim2Q3bS8M6sr7R6El0MA5PCYvzQIZGODa0qRcfw9g1gs1QIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDgubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSJ0nbp3OFnKGbwbldL
+n2a+JedT8TANBgkqhkiG9w0BAQUFAAOCAQEANwWlJk9kNjgdiglNoI3+peHPpqJi
+EfOVP10VNSFJYWxww3G1YIUmABDF5z1/4z3OSbBi/sTbPM5LkrXITpZO1OoGRAPR
+7MufE3ZtwBkMKUuK2kT8RiBIHvHFFVl7DEJYGJIz+EG6XetkRRvQq8IuduTsro3+
+7ropOdBs0K7X9GV9IhCjCOyJeawAlRn0NB1L4bmKDfbJhxDLcGV6LxRrsVy7mcfl
+bp4cVLZwNNktOTYIP7rHzxthFF8fpi0846X/j/HkFRAfdv51Tz74KwJoZ8a3dC4n
+Ld+xpeD/skZA/APgHC4KyHTCFax4Bef7uRlKqxjhtnbjJgnBaduKEc4OgA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4bfcf918
--- /dev/null
+++ b/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_078cbb3a8aab5f0802d2d20af4e703754de2eb4b" entityID="https://nya-48.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-48.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/Lh6K7hwMNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ2WhcNMjIwMjE3
+MTIxMzQ2WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAteYSycwkSxAIjjRtMIR+Momc2ZIg+7BF
+H/82vr1mq9Tkp/tq1uRJCtKBNmfDsKUK9SkeqXh2XPfukS68dU/DQRhxE+i1+jWr
+JBJolfiaeFp79VB+gTQRhaERzDaLiWSRX+oEht2pH8ktPTX/F7lk9Fdd3yMPonFw
+qOpK0ipbUOQkQvPQXitQ3Wz2ree0e/TrBbUtxIjDLpZ2i5NLXSK/myZYA0nVJ/+U
+UcdsjT4W9XjVmx/5HS9wFddgcCGARW8iuD9VDZ0I3j1ssVVgJWBs34KNKlen6eKK
+YhuEpvkURIgyLadoi1Sk0sLKHhCOtG2AflRlfOCtbtu69ajLE4wqbQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDgubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBStNj8fimlpM/uHtpx1mkYI
+gy+fVzANBgkqhkiG9w0BAQUFAAOCAQEAhLeyPev+WL+bWVvxTDEvJJw9stQ13VEb
+4DXa/YY1s5SPNsT/sR+ICQ2S+cKdeUCMs77vj/TbzEjNL8vFgm9mwQVkM5+d2XWB
+HVQ+V4mr0KFSeMhSrPzP0/IzJJZ1UG8qb7D5LG4fQ+4+hyxwb0MtczIpci/tJlVZ
+u+bG+fWj7PvIJLJcIETQOyKNkrdvD//1Q4csRFJPcW5Jlm8iP/NlElwkeANWK7Rn
+kWqPs+n25jgxp6Rbs63uGOob5czQrPhJ/ZH5T7pdJ8TDTZZwAiYMJ8uqMfsygtJO
+7qxLeO+0/qpdpZq8nHlK5CMdSdkDu/g8GAR+Vh8WUXkmECV5HhFpDw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.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-48.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.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-48.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-48.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-48.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-48.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-48.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..c131eb1c
--- /dev/null
+++ b/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-48.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-48.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-48.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-48.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-48.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-48.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-48.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-48.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/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..008c97ae
--- /dev/null
+++ b/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_500c84563c12b3605f0798d54396ca6d3b6101b2" entityID="https://nya-48.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-48.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOWzeN1n4fSfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ4WhcNMjIwMjE3
+MTIxMzQ4WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt46bHIrH1UxDGmUkPQ8zk0AjwOykg5qz
+Sgs6RDthEQaEMV4U4FnA1IgQrWkP4b5ypn52ljuVPpSfHy90z09NbmiO/19S+d1a
+5WDyvaV/DmAQOla/dQ/AwJ01p81fjWP8fGTlfG1i56wE/w1QK/KU3UQVeP0YjFXB
+T6Qjy3W/TO8QAL5n64H+rY5l0JKmA4N43tPDPpYNB8QELNZdeF3fCmCiRvd7ZEr6
+6L+Df7LI+C9v804vcrhnj4GyyHOMYCNSEHPJHA0D4hrHZVpxw9VCHYRc2TyzaIBm
+A6EWum8BkEiy7VcowPKjpN8BFGZGvdw3MDzUbEH9h57tb8XZgipxcwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDgubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR9Em1nezTSUcY018x3Sz6C
+O/w3FDANBgkqhkiG9w0BAQUFAAOCAQEAqFDlFFRoqt2HVOQBdinvju0nFi9ef10b
+TVfEjvMODTH3pFICcDODmRCxN+I2TOSKaiy4GoPWm2BN83PPRoPGDbfjhqVWrd2K
+Plp5BT75lSeux2v0GnJNqnclaACrZIgrF42Z+iiKYNiTeO8zy0RsNFFndnipWMpI
+U0x5DyU7WjHvfCWolOl9Vrc6m742lB4JVolf6g20bsRjsTjukZvpvo7l1/yj92l5
+TJNC9duOEgnZzzEzcAOZ67gLMf6QeisY3eMpWtbh5DOekKSXBv9Xmk2pWTViTKZH
+xpwu1BXpAzhSvrSWzn05rfqCc1IGOT4sTSv99GRgYU0464GidHpmUg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.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-48.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-48.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.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-48.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-48.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..733406d0
--- /dev/null
+++ b/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-48.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-48.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-48.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-48.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-48.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-48.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-48.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-48.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/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a268aa92
--- /dev/null
+++ b/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_74cd0d028bc5cf2c2009495c896de20f275f049e" entityID="https://nya-49.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-49.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAIn8foGZevGhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU0WhcNMjIwMjE3
+MTIxMzU0WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1+GvxxOS8snlA1fT2NwYdStVrlEwngc
+5uDhGZMV5qJR90RqSGOYNYLzZ5AtbBOyZRrw9+POK0gzgLmDlW0n2XHY6i6VQsla
+TfKWbceQ5AAz2OjJdyc0FKAoAILJU38p4STiBwnDalWEIL4nA8LHr3Ur8SshG0HT
+BZcmM55rff6efr5QWJ6nPANgtovSsdoMPbYRf9VrVAlbL4StKSeRtZNE+lp7FPKn
+yIgUIrMFM4m9+m/7NKT15p2HZeXTNBxmum7ssvS0NlCzYCC9u60yp/lEd8UoHCmQ
+Imo1Mw8w4pSY/bGBp4zfJ73P1dRsk42pWUJxVvsj/M4NJdJU+j0qJwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDkubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRWfhcdcSIfzlbAhs8F
+5FxkSDlPNDANBgkqhkiG9w0BAQUFAAOCAQEALx+78LX6iqrNgpGjGg0a8I2b/LSR
+9FDznxi+lBVIVi8RPI4ySvl8x174mZaKsZaoskvJzP3USdETdNcxqMLtfqKWYWUV
+62my6C9wdHwyWcrw0Sqt+BOZ4J0JySLPlNcIHBojCjOzfrKFMx/WzMWtbS2fGzdc
+7Izcx/8KaRsQEOpwSeEzIcFtOVnBPOAyN2WxkevHCFgPwDDk+yEGDNVDUKdHOP0q
+YyM8TSkj8h73QkX6pz3RrNoDnrJ5rl7pDwhanS2koU5f65H/VxeGAXuuJrWkRjUb
+fwKWX/V4dW005rkbR3nkIWPvWsYSDuFTVfe2jOmiKU8UkiW1ZyPllyxg6g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..d2d202f2
--- /dev/null
+++ b/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_80f41f0cdfa397702ac1e50fba7d3c958ed2ddd6" entityID="https://nya-49.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-49.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL5gHI37k05eMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzUzWhcNMjIwMjE3
+MTIxMzUzWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVQVtvK/K73QPAtTymbOrxRkeBvAh0Cm
+cPQeLhPhW2/VH2aOEXUzwTEsi86VGSIE3n0tpwPaCmp2xZt49mxz8zkq0mQDxohW
+mlzFCq41wI7tpz5xglerV+tyJwERNDH2Iz2awSA5aZfm8GNoKZu0ssfTRiepH1b0
+kGPR4cwshFytYr3AA0EOhL7mAUEmsklzsJmTGc5B2l5nH66RitcsPo+soSThm+oO
+YSgTgdc/Cz1VnB5Z8bTxtlt9+aUamRm+CAE9ZCDMVOLvjIcAKlcs5yFUioVhQdWY
+y1Bl9pMFlPB9CnV10+TXLlXE76jpCXBA1nwbhDu6tLXAeZbXyMhzOQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDkubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQAqy9cVEPh0gQX+wPaDipl
+5o1AgDANBgkqhkiG9w0BAQUFAAOCAQEAhAuu/NAK4zruIOA1Urdxl0DtAE5TcOFz
+D6LLaAHb3f5vbUn6BIEniEmRsONosGzn12iDtKwMj36M4tHg60n4583eiPCcsDvW
+PLggRmMY0ERDou6w9zvZfxMUZvmMK2i3ddCU5UQ0UKHzOzYFZ7xMR3J/DN+VQtse
+NYfhieD03wZ7LfjwnVq4Dx5fApZ/OFYIYk4PCqT7OEDyHFkyPVTwK6zuwTvIrrjK
+pt3Q8BA6PO/g4psVpAnc+tWUEjHWLrvozhrO5iDpoE64K+PRZQxHDr/O4LQs5yns
+g2ZlkUDD0v0pz63tjTuCMjRidOOLjhMJOl7z0wj/fArFamDK/Fgw6g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.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-49.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.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-49.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-49.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-49.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-49.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-49.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..5e0e9278
--- /dev/null
+++ b/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-49.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-49.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-49.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-49.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-49.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-49.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-49.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-49.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/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..65be8850
--- /dev/null
+++ b/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a3e6369c8903be8900dc5a0991def751df998454" entityID="https://nya-49.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-49.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALTiBEkPLlfdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU1WhcNMjIwMjE3
+MTIxMzU1WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1L+/jXR3Q9zIDrKqsdWgDBriDIWtDxsx
+1HP+wyA/3z5hd3vFsJF5P9bDRTcFc6ljEmil2FyEjTf1Y6djUEyE1qKX1F41ruRr
+k/owVdZfZqK+IgLoEPZ/6lqZxkc7KmMAfTQ+qcJmtlUuvWU3nUQDuQHhu52L82g2
+xfsFV4NVSXOobhqdI+P0V6fEisxLc60n16wgZrurMUBCA0pO7J0PsDi1cMp5bVwl
+OGbsZAfEkSsshWnyQauk+koUoSPBV6KCwucXoXJWuU5DO1GAheG6HZQSUQJo94VU
+F1O8Gm1IHkCgFPSmN4Hx11C9yLYy0rXUYPGEgzYER+29cBnVYzzwAwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDkubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiSnwaPNRPV1Em8T1f6YIQ
+nbBnWTANBgkqhkiG9w0BAQUFAAOCAQEACtGYaAJuNV59Eb3BP3y7hZZqtWKGxzSE
+kUfCzYTtP/tcKs3BlwV/hbgiNkiZGr3tSIfLYapZWtZMQztTWOt9C0jGPLt3UT/a
+I3BT3dZOB6uUc8hYSprLUFNSPcKx0Vz5NxclRcgH5fxdOypdWkCwJ8FJBv6oHndh
+3XKIuZBCQODjwTFER9ikJ6PsdfINtTzX9kZPrqpHzNgHLZAdycE2c817fq71vcfp
+XsDVoeJyz4ZLwPmKUnh8aaUn0QNS6sf4BgUSoPz+jPlmlDLmDEErxw9xGTL7arLU
+wqJdwlaNHBJYQM/bE57IEQo+w6ImS+vTRmv4jFpd0UkiiqSlQ1DKRw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.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-49.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-49.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-49.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-49.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-49.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..9ca09950
--- /dev/null
+++ b/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-49.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-49.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-49.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-49.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-49.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-49.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-49.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-49.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/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..2fa9a3cd
--- /dev/null
+++ b/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0a802a847a08d247ff3de051da88a481c44aacd7" entityID="https://nya-50.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-50.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOfUla/9GwRqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDAxWhcNMjIwMjE3
+MTIxNDAxWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEece+RKhm3N1BP7W7mQL1VUIWEezbYL
+PtP8xJaTQ0dBJyW4qO1dQFCxxBG2jRqBhphH85YOUWP6pwvy14xgJNY4GlkQ1Ljq
+m7QHB1Oe9xDsbLeQdpnMFYJpt9Xqk9fUzWWYP6vi/TUTZqexEvLvRPZA8tXFc+vE
+5NS2WXvAp1DU1LMKPcEfD0rXbJXLuJL5CqDYDtGe5oIKDv3ZOjUY/yxLlHQaDcZg
+Vz8R8k1BgvfKm3QkaubiDzPL3oRqgB5jGq7IA2/Iu3XVPZ6fTvCSdm9NlUgwCyy7
+q3YbSNx8tE7Fc6lsMkFsRUtZ1/7r8FpsJb3Wy05+NHwKQgT3YXrB0QIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNTAubGFkb2sudW11LnNlhiVodHRwczovL255YS01
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRjxiq4M/Q3PE56NMgQ
+4qPCk+CE0DANBgkqhkiG9w0BAQUFAAOCAQEAkf0Bi3RxWVukg4Y6fg+5W7OkPczh
++F14HIkOBF9huEzs8KzkamJMmqBVTyozcaLe3Ohrml2FNShjY0TA4YQGgVLUWGOG
+HnSlB5IYgQQ2l3P45e6H3eTVbdeXFSTLn27Me2xRtoBAspAhCAYlW//rtfuGM9HD
+frfKH3aYFfVnWzumnaCReB9AL5P5wjRNWqeo6JZeQI3CTLvbm3Ox3B0cXh1mk/4T
+FWmypCx6sjn+v/7fckstlh1QVqANsRkitYiYMs08UUXHnobqffpk2fWqzO1qiTt4
+PVB1CNb1sjfUbkvX5zSoIKsrl3E1T1k70ec+aK0GKun8Q8kLQ4T/ApeVWA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..1c7ba274
--- /dev/null
+++ b/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_8b06afc6d5e8519bba5a7942f8c3af0e5a65297a" entityID="https://nya-50.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-50.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4Oqaf6wmwiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU5WhcNMjIwMjE3
+MTIxMzU5WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsp9U0/1GzGisdx6nprPQFlsWIAm8WcIg
+wX2z4zEUTqWX281jEKZeiQPBiVwqgstbFD2imeagvKZu7XMdRdNu8PoJCGR9w34s
+XFVM/v+OGpeW6PAqZc7tZuZyYPnWFXYNMWbkyHx9toytD7FB9c0VpQ/3vEL+lxH2
+rykt3B+2rsBZKZ9JF4qzOkdoJp6OUWg2tLkMwfkI6TbNQGaKyn1nX32BFufQ/PUt
+5xQYg6GYjOWNw9EzOwwZOAkHlTMSviLTw9pRbaxaFjjWjCqyRA0TgPA6pmt4/eHK
+fC+G0zTOocG2046xoww3Z5Q8TzAFtzb0I2hJqUSsJfL49hRJJB8JsQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNTAubGFkb2sudW11LnNlhiJodHRwczovL255YS01
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRdGpgRieLuLGQQH5UpGDSz
+u9uS5TANBgkqhkiG9w0BAQUFAAOCAQEAJL4Dd/lRMO2KRcdjcCFKDV5dFFyKreXI
+K5Lt08Ug7prKXIjF77pdJQ9SuJWj++O6vCeiuqECleEze/X3fawEyGvcVEiyXIkK
+IAxydZvbdrCQ5NLTD/ty5lZNHkU++KqGNvP+wGZCQaIHOttYcfaBwUS/7gFiasfk
+NfmWRBX8sx6YkM39n/UAsPkZqFvBEY1F6PXOCLY0DarT0Uql9mzphkApzrqtsenU
+bIEkJ+83BF40dm08OJofJ8FdPlH5k007I0GRCtbgPnlpbYgdIrgf92dCBRARnHL9
+AfvBMf8ezEVhZNiBN6F+cZ1IhAGGQSXWyXhyUY3xYjOL/tLKJMRwTw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.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-50.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.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-50.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-50.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-50.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-50.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-50.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..94106a81
--- /dev/null
+++ b/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-50.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-50.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-50.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-50.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-50.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-50.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-50.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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-50.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/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..3657c60e
--- /dev/null
+++ b/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_cdfbc94c669c53f1f3442c859ab6aada4debbd6b" entityID="https://nya-50.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-50.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIokpeEwV7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA1WhcNMjIwMjE3
+MTIxNDA1WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxB1/xbbsaJ2X1hTp4c+UVgVmzNmSP6yq
+8mGVcRRF2mq6oZYYh57YXA87IoD8f1gJEPO4oi0NuUb5S9LwE2rQFyantqP8DzzG
+qWgOdRI9zgNPPPNSpXKmz7c93iPWfGs9RpUSTWd2jVGCBkoAsoVauwkcasvjaHEc
+5JLdZ5uCBqDwkW2DyrMw/xsUc7hGJRJHKGgQWLlTxwRi+qXLAgwXiY6CQ1a3/5rY
+cMSKcdX1KVmxtwC0I03jgqTy4HyfiEN3WWlZmmfTvOmsKyBcC1gEc0TV+yXAxIQ2
+WVOmxNWosmTOWdZk0FYYXv8LwxiU7DGssqN5AbWlxv5e5p5tC1ocjQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNTAubGFkb2sudW11LnNlhiJodHRwczovL255YS01
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTSmDNwjs+ZXnFvDieHFIid
+ZUGVrDANBgkqhkiG9w0BAQUFAAOCAQEALQQUWTqG5UoSk/PJpPpYDR1I2LvAWScE
+sZRpkUVTz8m6YZ6lSB1xdrW5TajKJt5NnF6hN/Ju8JB5jmAkMSn7kTbKliEkCHXw
+tMtS65NtEy+0yiAT+3kt9R83Sh7GHEr4qVSq6yWPdGPTmPtqMvRRYqOA4emVMvJr
+EmRTpg5fswe5HFbR3Z/xKy/0kFKgrD702RZyJQKNI+WxpTOaHocZfm8fq2r8nr7J
+1b2yKp2xUOgORRyz/vbb+4FUXEWAbUM/isn/yEzXPnUjX7kNl3RVCVgy5vfNBR1l
+Mtb7xKVUgESXBWbefVO7KqFsgXC3H0WthuTgTtskerkx0f+gylcp0g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.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-50.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-50.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-50.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-50.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-50.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..9015c43f
--- /dev/null
+++ b/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://nya-50.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://nya-50.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-50.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-50.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://nya-50.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-50.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-50.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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://nya-50.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/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 7bc121fd..2cf029a7 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -189,4 +189,79 @@
   <xi:include href="swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.testa.universityadmissions.se.xml"/>
+  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
 </EntitiesDescriptor>